1 files changed, 0 insertions, 0 deletions
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/features/org.eclipse.jem.feature.patch/.project b/features/org.eclipse.jem.feature.patch/.project
deleted file mode 100644
index e4e6163f0..000000000
--- a/features/org.eclipse.jem.feature.patch/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jem.feature.patch</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.jem.feature.patch/build.properties b/features/org.eclipse.jem.feature.patch/build.properties
deleted file mode 100644
index 60e19e566..000000000
--- a/features/org.eclipse.jem.feature.patch/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = eclipse_update_120.jpg,\
-               epl-v10.html,\
-               feature.properties,\
-               feature.xml,\
-               license.html
diff --git a/features/org.eclipse.jem.feature.patch/buildnotes_org.eclipse.jem.feature.patch.html b/features/org.eclipse.jem.feature.patch/buildnotes_org.eclipse.jem.feature.patch.html
deleted file mode 100644
index 5909897fc..000000000
--- a/features/org.eclipse.jem.feature.patch/buildnotes_org.eclipse.jem.feature.patch.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="Build" content="Build">
-   <title>WTP 1.5.5 Patches</title>
-</head>
-
-<body>
-
-<h1>WTP 1.5.5 Patches</h1>
-
-<h2>org.eclipse.jem</h2>
-
-<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=237148'>237148</a>. classes which implement inner interfaces which are also inner interfaces are not resolved correctly</p>
-<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=247701'>247701</a>. JavaFieldJDOMAdapter causing StringIndexOutOfBoundsException</p>
-<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=247895'>247895</a>. EJBValidator fails silently</p>
-<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=249019'>249019</a>. Japanese chars in source code changed to illegible unicode</p>
-<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=272013'>272013</a>. JEM JemProjectUtilities#getClasspathAsURLArray(IJavaProject) fails to handle class folders</p>
-<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=290131'>290131</a>. Exceptions from JEM in adopter product</p>
-</body></html>
-\ No newline at end of file
diff --git a/features/org.eclipse.jem.feature.patch/eclipse_update_120.jpg b/features/org.eclipse.jem.feature.patch/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jem.feature.patch/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jem.feature.patch/epl-v10.html b/features/org.eclipse.jem.feature.patch/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.jem.feature.patch/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
-\ No newline at end of file
diff --git a/features/org.eclipse.jem.feature.patch/feature.properties b/features/org.eclipse.jem.feature.patch/feature.properties
deleted file mode 100644
index cbd167889..000000000
--- a/features/org.eclipse.jem.feature.patch/feature.properties
+++ /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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WTP Patch for Java EMF Model
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Visual Editor update site
-
-# "description" property - description of the feature
-description=\
-Contains fixes in the following: \n\
-Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=237148 classes which implement inner interfaces which are also inner interfaces are not resolved correctly\n\
-Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=247701 JavaFieldJDOMAdapter causing StringIndexOutOfBoundsException\n\
-Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=247895 EJBValidator fails silently\n\
-Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=249019 Japanese chars in source code changed to illegible unicode\n\
-Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=272013 JEM JemProjectUtilities#getClasspathAsURLArray(IJavaProject) fails to handle class folders\n\
-Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=290131 Exceptions from JEM in adopter product\n\
-\n\
-copyright=\
-Copyright (c) 2008 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-September, 2008\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
-\ No newline at end of file
diff --git a/features/org.eclipse.jem.feature.patch/feature.xml b/features/org.eclipse.jem.feature.patch/feature.xml
deleted file mode 100644
index e43782851..000000000
--- a/features/org.eclipse.jem.feature.patch/feature.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jem.feature.patch"
-      label="%featureName"
-      version="1.2.5.qualifier"
-      provider-name="%providerName">
-
-    <description>%description</description>
-
-    <copyright>%copyright</copyright>
-
-    <license url="%licenseURL">%license</license>
-
-   <requires>
-      <import feature="org.eclipse.jem" version="1.2.4.v200704181020--6zXJK0L0SE3a95" patch="true"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.jem"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-         
-   <plugin
-         id="org.eclipse.jem.workbench"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jem.feature.patch/license.html b/features/org.eclipse.jem.feature.patch/license.html
deleted file mode 100644
index c6af966b6..000000000
--- a/features/org.eclipse.jem.feature.patch/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.patch/.project b/features/org.eclipse.jst.enterprise_core.feature.patch/.project
deleted file mode 100644
index fa4494a12..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature.patch/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.enterprise_core.feature.patch</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.enterprise_core.feature.patch/build.properties b/features/org.eclipse.jst.enterprise_core.feature.patch/build.properties
deleted file mode 100644
index cb50260a9..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature.patch/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg
diff --git a/features/org.eclipse.jst.enterprise_core.feature.patch/buildnotes_org.eclipse.jst.enterprise_core.feature.patch.html b/features/org.eclipse.jst.enterprise_core.feature.patch/buildnotes_org.eclipse.jst.enterprise_core.feature.patch.html
deleted file mode 100644
index a1d3203e5..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature.patch/buildnotes_org.eclipse.jst.enterprise_core.feature.patch.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta name="Build" content="Build">
-<title>WTP 1.5.5 Patches</title>
-</head>
-
-<body>
-
-<h1>WTP 1.5.5 Patches</h1>
-
-<h2>org.eclipse.jst.enterprise_core.feature</h2>
-<p>Bug <a
-	href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=206463'>206463</a>.
-Threading issues with WebServicesNode Job</p>
-<p>Bug <a
-	href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=246289'>246289</a>.
-get 218519 into 155 patches</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/features/org.eclipse.jst.enterprise_core.feature.patch/eclipse_update_120.jpg b/features/org.eclipse.jst.enterprise_core.feature.patch/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature.patch/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.enterprise_core.feature.patch/epl-v10.html b/features/org.eclipse.jst.enterprise_core.feature.patch/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature.patch/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
-\ No newline at end of file
diff --git a/features/org.eclipse.jst.enterprise_core.feature.patch/feature.properties b/features/org.eclipse.jst.enterprise_core.feature.patch/feature.properties
deleted file mode 100644
index 7db573e73..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature.patch/feature.properties
+++ /dev/null
@@ -1,148 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WTP Patch for org.eclipse.jst.enterprise_core.feature
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=\
-This patch feature fixes problems as described in following bugs:\n\
-Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=206463 Threading issues with WebServicesNode Job\n\
-Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=246289 get 218519 into 155 patches\n\
-\n\
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2007 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-September 27, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.enterprise_core.feature.patch/feature.xml b/features/org.eclipse.jst.enterprise_core.feature.patch/feature.xml
deleted file mode 100644
index 9493a7c5d..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature.patch/feature.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.enterprise_core.feature.patch"
-    label="%featureName"
-    version="1.5.5.qualifier"
-    provider-name="%providerName">
-
-    <description>%description</description>
-
-    <copyright>%copyright</copyright>
-
-    <license url="%licenseURL">%license</license>
-
-
-   <requires>
-      <import feature="org.eclipse.jst.enterprise_core.feature" version="1.5.5.v200707311635--2PD88S8V_KASA8" patch="true"/>
-   </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"/>
-</feature>
diff --git a/features/org.eclipse.jst.enterprise_core.feature.patch/license.html b/features/org.eclipse.jst.enterprise_core.feature.patch/license.html
deleted file mode 100644
index 2347060ef..000000000
--- a/features/org.eclipse.jst.enterprise_core.feature.patch/license.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>) 
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>) 
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>) 
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>) 
-
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) 
-  </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature.patch/.cvsignore b/features/org.eclipse.jst.enterprise_ui.feature.patch/.cvsignore
deleted file mode 100644
index c14487cea..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature.patch/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.jst.enterprise_ui.feature.patch/.project b/features/org.eclipse.jst.enterprise_ui.feature.patch/.project
deleted file mode 100644
index b157d640f..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature.patch/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.enterprise_ui.feature.patch</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature.patch/build.properties b/features/org.eclipse.jst.enterprise_ui.feature.patch/build.properties
deleted file mode 100644
index cb50260a9..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature.patch/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg
diff --git a/features/org.eclipse.jst.enterprise_ui.feature.patch/buildnotes_org.eclipse.jst.enterprise_ui.feature.patch.html b/features/org.eclipse.jst.enterprise_ui.feature.patch/buildnotes_org.eclipse.jst.enterprise_ui.feature.patch.html
deleted file mode 100644
index fe4d2f384..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature.patch/buildnotes_org.eclipse.jst.enterprise_ui.feature.patch.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="Build" content="Build">
-   <title>WTP 1.5.5 Patches</title>
-</head>
-
-<body>
-
-<h1>WTP 1.5.5 Patches</h1>
-
-<h2>org.eclipse.jst.enterprise_ui.feature</h2>
-
-<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=201942'>201942</a>. Web App Libraries container causes hang</p>
-<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=204315'>204315</a>. Web Lib projects being added to the EAR</p>
-<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=206478'>206478</a>. Importing a .war causes error</p>
-<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=200193'>200193</a>. Cannot use Java project for BUJava</p>
-<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=215537'>215537</a>. J2EEComponentProjectMigrator always adding WebAppLibrary classpath container</p>
-<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=215538'>215538</a>. Several problems with J2EE and Web Dependencies properties pages</p>
-<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=216779'>216779</a>. Unable to add specific project to web library</p>
-<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=205126'>205126</a>. Java Utility jars containg wrong archive name</p>
-<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=247301'>247301</a>. Service classes in JSR-109 Web service section does not update after changing implementation bean</p>
-</body></html>
-\ No newline at end of file
diff --git a/features/org.eclipse.jst.enterprise_ui.feature.patch/eclipse_update_120.jpg b/features/org.eclipse.jst.enterprise_ui.feature.patch/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature.patch/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.enterprise_ui.feature.patch/epl-v10.html b/features/org.eclipse.jst.enterprise_ui.feature.patch/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature.patch/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
-\ No newline at end of file
diff --git a/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.properties b/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.properties
deleted file mode 100644
index b8fdf1afb..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.properties
+++ /dev/null
@@ -1,157 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WTP Patch for org.eclipse.jst.enterprise_ui.feature
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=\n\
-\n\
-The fixes are described in the following bugzilla entries:\n\
-\n\
-Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=201942 Web App Libraries container causes hang\n\
-Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=204315 Web Lib projects being added to the EAR\n\
-Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=204833 deadlock caused by WebServiceViewerSynchronization\n\
-Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=200193 Cannot use Java project for BUJava\n\
-Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=215537 J2EEComponentProjectMigrator always adding WebAppLibrary classpath container\n\
-Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=215538 Several problems with J2EE and Web Dependencies properties pages\n\
-Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=216779 Unable to add specific project to web library\n\
-Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=205126 Java Utility jars containg wrong archive name\n\ 
-Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=247301 Service classes in JSR-109 Web service section does not update after changing implementation bean\n\
-\n\
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2007 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-September 27, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.xml b/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.xml
deleted file mode 100644
index 3e49fa08d..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.enterprise_ui.feature.patch"
-      label="%featureName"
-      version="1.5.5.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import feature="org.eclipse.jst.enterprise_ui.feature" version="1.5.5.v200707311635-pEBqMgr5s5Phpf6" patch="true"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.servlet.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.webservice.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.consumption.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.creation.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature.patch/license.html b/features/org.eclipse.jst.enterprise_ui.feature.patch/license.html
deleted file mode 100644
index 2347060ef..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature.patch/license.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>) 
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>) 
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>) 
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>) 
-
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) 
-  </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.jst.servlet.ui.patch/.project b/features/org.eclipse.jst.servlet.ui.patch/.project
deleted file mode 100644
index 2321333b3..000000000
--- a/features/org.eclipse.jst.servlet.ui.patch/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.servlet.ui.patch</name>
-	<comment>removed the need for this project, by combining with enterprise_ui</comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.web_ui.feature.patch/.cvsignore b/features/org.eclipse.jst.web_ui.feature.patch/.cvsignore
deleted file mode 100644
index c14487cea..000000000
--- a/features/org.eclipse.jst.web_ui.feature.patch/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.jst.web_ui.feature.patch/.project b/features/org.eclipse.jst.web_ui.feature.patch/.project
deleted file mode 100644
index 4603a674b..000000000
--- a/features/org.eclipse.jst.web_ui.feature.patch/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.web_ui.feature.patch</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.web_ui.feature.patch/build.properties b/features/org.eclipse.jst.web_ui.feature.patch/build.properties
deleted file mode 100644
index 82a5a4cbe..000000000
--- a/features/org.eclipse.jst.web_ui.feature.patch/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg,\
-               buildnotes_org.eclipse.jst.web_ui.feature.patch.html
diff --git a/features/org.eclipse.jst.web_ui.feature.patch/buildnotes_org.eclipse.jst.web_ui.feature.patch.html b/features/org.eclipse.jst.web_ui.feature.patch/buildnotes_org.eclipse.jst.web_ui.feature.patch.html
deleted file mode 100644
index 259d40005..000000000
--- a/features/org.eclipse.jst.web_ui.feature.patch/buildnotes_org.eclipse.jst.web_ui.feature.patch.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta name="Build" content="Build">
-<title>WTP 1.5.5 Patches</title>
-</head>
-
-<body>
-
-<h1>WTP 1.5.5 Patches</h1>
-
-<p>Bug <a
-	href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=234781">234781</a>.
-Fixes needed for JSP validation and other minor updates</p>
-<p>Bug <a
-	href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=247714">247714</a>.
-Markup Validator causes phantom errors for JSP files</p>
-<p>Bug <a
-	href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=262637'>262637</a>.
-JSP quote escaping as per JSP rules in tag attributes are reported as ERRORS.</p>
-</body>
-</html>
-\ No newline at end of file
diff --git a/features/org.eclipse.jst.web_ui.feature.patch/eclipse_update_120.jpg b/features/org.eclipse.jst.web_ui.feature.patch/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.web_ui.feature.patch/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_ui.feature.patch/epl-v10.html b/features/org.eclipse.jst.web_ui.feature.patch/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.jst.web_ui.feature.patch/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
-\ No newline at end of file
diff --git a/features/org.eclipse.jst.web_ui.feature.patch/feature.properties b/features/org.eclipse.jst.web_ui.feature.patch/feature.properties
deleted file mode 100644
index 09b5af366..000000000
--- a/features/org.eclipse.jst.web_ui.feature.patch/feature.properties
+++ /dev/null
@@ -1,149 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WTP Patch for jst.web_ui
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=\
-This patch fixes problems described in the following bugs: \n\
-Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=234781 Fixes needed for JSP validation and other minor updates\n\
-Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=247714 Markup Validator causes phantom errors for JSP files\n\
-Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=262637 JSP quote escaping as per JSP rules in tag attributes are reported as ERRORS.\n\
-\n\
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2008 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June, 2008\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.web_ui.feature.patch/feature.xml b/features/org.eclipse.jst.web_ui.feature.patch/feature.xml
deleted file mode 100644
index 8ac324c81..000000000
--- a/features/org.eclipse.jst.web_ui.feature.patch/feature.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.web_ui.feature.patch"
-      label="%featureName"
-      version="1.5.5.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import feature="org.eclipse.jst.web_ui.feature" version="1.5.5.v200708020120--2PD88Q8T9FAIAH" patch="true"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.jst.jsp.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.web_ui.feature.patch/license.html b/features/org.eclipse.jst.web_ui.feature.patch/license.html
deleted file mode 100644
index 2347060ef..000000000
--- a/features/org.eclipse.jst.web_ui.feature.patch/license.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>) 
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>) 
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>) 
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>) 
-
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) 
-  </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/plugins/org.eclipse.jem.workbench/.classpath b/plugins/org.eclipse.jem.workbench/.classpath
deleted file mode 100644
index 8fd3a20b8..000000000
--- a/plugins/org.eclipse.jem.workbench/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="workbench/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jem.workbench/.cvsignore b/plugins/org.eclipse.jem.workbench/.cvsignore
deleted file mode 100644
index 60463af3f..000000000
--- a/plugins/org.eclipse.jem.workbench/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-build.xml
diff --git a/plugins/org.eclipse.jem.workbench/.project b/plugins/org.eclipse.jem.workbench/.project
deleted file mode 100644
index c4f735483..000000000
--- a/plugins/org.eclipse.jem.workbench/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jem.workbench</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.jem.workbench/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.jem.workbench/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index d7ce39e52..000000000
--- a/plugins/org.eclipse.jem.workbench/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Apr 15 21:22:16 EDT 2007
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/plugins/org.eclipse.jem.workbench/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jem.workbench/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index aa19783e9..000000000
--- a/plugins/org.eclipse.jem.workbench/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,294 +0,0 @@
-#Sun Apr 15 21:31:38 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-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.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=error
-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.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-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.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
-org.eclipse.jdt.core.formatter.comment.format_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=150
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=150
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
diff --git a/plugins/org.eclipse.jem.workbench/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.jem.workbench/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 6c8e1bc01..000000000
--- a/plugins/org.eclipse.jem.workbench/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Tue Feb 21 10:09:19 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.workbench/META-INF/MANIFEST.MF b/plugins/org.eclipse.jem.workbench/META-INF/MANIFEST.MF
deleted file mode 100644
index e132e4d3e..000000000
--- a/plugins/org.eclipse.jem.workbench/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jem.workbench; singleton:=true
-Bundle-Version: 1.2.6.qualifier
-Bundle-Activator: org.eclipse.jem.internal.plugin.JavaPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jem.internal.adapters.jdom;x-friends:="org.eclipse.jem.beaninfo,org.eclipse.jem.tests",
- org.eclipse.jem.internal.plugin;x-friends:="org.eclipse.jem.beaninfo",
- org.eclipse.jem.workbench.utility
-Require-Bundle: org.eclipse.jem;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem.util;bundle-version="[1.2.0,2.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/plugins/org.eclipse.jem.workbench/about.html b/plugins/org.eclipse.jem.workbench/about.html
deleted file mode 100644
index afceed0cc..000000000
--- a/plugins/org.eclipse.jem.workbench/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.workbench/build.properties b/plugins/org.eclipse.jem.workbench/build.properties
deleted file mode 100644
index 11e482e22..000000000
--- a/plugins/org.eclipse.jem.workbench/build.properties
+++ /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
-###############################################################################
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               about.html,\
-               META-INF/,\
-               .
-src.includes = about.html
-
-source.. = workbench/
-output.. = bin/
-jars.compile.order = .
diff --git a/plugins/org.eclipse.jem.workbench/plugin.properties b/plugins/org.eclipse.jem.workbench/plugin.properties
deleted file mode 100644
index ee32234b3..000000000
--- a/plugins/org.eclipse.jem.workbench/plugin.properties
+++ /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
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.workbench/plugin.properties,v $
-# $Revision: 1.5 $  $Date: 2005/08/24 21:13:53 $
-#
-
-
-pluginName=Java EMF Model Workbench Support
-providerName = Eclipse.org
-
-JavaEMFNatureName=JavaEMFNature Properties
diff --git a/plugins/org.eclipse.jem.workbench/plugin.xml b/plugins/org.eclipse.jem.workbench/plugin.xml
deleted file mode 100644
index 15089056e..000000000
--- a/plugins/org.eclipse.jem.workbench/plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-     <extension
-         id="JavaEMFNature"
-         name="%JavaEMFNatureName"
-         point="org.eclipse.core.resources.natures">
-      <runtime>
-         <run
-               class="org.eclipse.jem.internal.plugin.JavaEMFNature">
-         </run>
-      </runtime>
-   </extension>
-   
-   <extension
-         point="org.eclipse.jem.util.nature_registration">
-      <nature
-            id="org.eclipse.jem.workbench.JavaEMFNature">
-      </nature>
-   </extension>   
-
-</plugin>
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JDOMAdaptor.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JDOMAdaptor.java
deleted file mode 100644
index d7f6e8e17..000000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JDOMAdaptor.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.jem.internal.adapters.jdom;
-/*
- *  $RCSfile: JDOMAdaptor.java,v $
- *  $Revision: 1.9 $  $Date: 2007/01/30 14:39:13 $ 
- */
-
-import java.io.File;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jem.java.*;
-import org.eclipse.jem.internal.java.adapters.JavaReflectionAdaptor;
-import org.eclipse.jem.internal.java.adapters.nls.ResourceHandler;
-import org.eclipse.jem.java.internal.impl.JavaRefFactoryImpl;
-/**
- * Insert the type's description here.
- * Creation date: (6/6/2000 4:42:50 PM)
- * @author: Administrator
- */
-public abstract class JDOMAdaptor extends JavaReflectionAdaptor {
-
-	protected final static JavaRefPackage JAVA_PACK = JavaRefFactoryImpl.getPackage();
-	protected IJavaProject sourceProject;
-	final public static int INVALID_LINENO = -1;
-	final protected Integer fLINENOLock = new Integer(INVALID_LINENO);
-	// This object is not static, as it is used as synchronization element.
-	private int fResolvedLineNo = INVALID_LINENO; // Line offset in source file
-	private int fResolvedColNo = INVALID_LINENO; // Column offset in source file
-	public JDOMAdaptor(Notifier target, IJavaProject workingProject) {
-		super(target);
-		setSourceProject(workingProject);
-	}
-	protected void clearSource() {
-		// To be overidden if needed.
-	}
-	
-	/**
-	 * Called by subclasses in canReflect(). If the target is not in a resource, or the
-	 * resource is not loaded, then it can't reflect. Mustn't reflect if the target
-	 * has been unloaded.
-	 * 
-	 * @return
-	 */
-	protected boolean isResourceLoaded() {
-		Resource res = ((EObject) getTarget()).eResource();
-		return res != null && res.isLoaded();
-	}
-	
-	/**
-	 * Scan for CRs and LFs within a character buffer
-	 * Creation date: (8/17/2001 2:14:13 PM)
-	 * @return int  LineNo at charOffset
-	 * @param charOffset int
-	 * @param buffer org.eclipse.jdt.core.IBuffer
-	 */
-	private void computeLineOffset(int charOffset, IBuffer buffer) {
-
-		fResolvedColNo = fResolvedLineNo = INVALID_LINENO;
-
-		if (buffer == null)
-			return;
-
-		char[] charBuff = buffer.getCharacters();
-
-		if (charBuff == null)
-			return;
-
-		int LineCount = 0;
-		int ColNo = 0;
-		for (int i = 0; i <= charOffset; i++) {
-			ColNo++;
-			if (charBuff[i] == '\r') {
-				LineCount++;
-				ColNo = 0;
-				if (charBuff[i + 1] == '\n')
-					i++; // skip LineFeed followed  a CR
-			} else if (charBuff[i] == '\n') {
-				LineCount++;
-				ColNo = 0;
-			}
-
-		}
-		fResolvedColNo = ColNo;
-		fResolvedLineNo = LineCount;
-	}
-	/**
-	 * computeMethodID - generate the unique ID to be used to identify a method.
-	 * Similar to a Signature, but hopefully more readable.
-	 * The name format will be:
-	 * 	simpleTypeName.methodName(my.package.Parm_Type1,parmType2
-	 * Note: This implementation is tightly coupled with ReflectionAdapter.getTypeNamesFromMethodID().
-	 */
-	public static String computeMethodID(IMethod jdomMethod) {
-		return computeMethodID(jdomMethod, jdomMethod.getDeclaringType(), null);
-	}
-	/**
-	 * computeMethodID - generate the unique ID to be used to identify a method.
-	 * Similar to a Signature, but hopefully more readable.
-	 * The name format will be:
-	 * 	simpleTypeName.methodName(my.package.Parm_Type1,parmType2
-	 * Note: This implementation is tightly coupled with ReflectionAdapter.getTypeNamesFromMethodID().
-	 */
-	public static String computeMethodID(IMethod jdomMethod, IType type, Map typeCache) {
-		StringBuffer out = new StringBuffer();
-		out.append(type.getTypeQualifiedName());
-		out.append(C_CLASS_MEMBER_DELIMITER);
-		out.append(jdomMethod.getElementName());
-		out.append(C_METHOD_PARM_DELIMITER);
-		String[] parmTypeNames = jdomMethod.getParameterTypes();
-		String parmName;
-		for (int i = 0; i < parmTypeNames.length; i++) {
-			parmName = convertJDOMtypeName(parmTypeNames[i]);
-			parmName = JDOMSearchHelper.getResolvedTypeName(parmName, type, typeCache);
-			out.append(parmName);
-			if (i < (parmTypeNames.length - 1))
-				out.append(C_PARM_PARM_DELIMITER);
-		}
-		try {
-			if (jdomMethod.isConstructor())
-				out.append(S_CONSTRUCTOR_TOKEN);
-		} catch (JavaModelException e) {
-		}
-		return out.toString();
-	}
-	/**
-	 * 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(IMethod jdomMethod) {
-		return jdomMethod.getElementName();
-	}
-	/**
-	 * Java content has changed, but no structural changes that require
-	 * to reflectValues();  e.g., the body of a method has changed.
-	 * Creation date: (8/17/2001 10:47:58 AM)
-	 */
-	public void contentChanged() {
-		synchronized (fLINENOLock) {
-			fResolvedLineNo = INVALID_LINENO;
-			fResolvedColNo = INVALID_LINENO;
-		}
-	}
-	/**
-	 * computeMethodID - generate the unique ID to be used to identify a method.
-	 * Similar to a Signature, but hopefully more readable.
-	 * The name format will be:
-	 * 	methodName_parmType1_parmType2
-	 */
-	public static String convertJDOMtypeName(String jdomTypeName) {
-		return signatureToString(jdomTypeName);
-	}
-	/**
-	 * createJavaField - instantiate a Java Field based on the passed Java Model IField
-	 * We are deferring field contents assuming that its adaptor will reflect its details.
-	 */
-	public Field createJavaField(IField jdomField, XMIResource resource) {
-		String name = jdomField.getElementName();
-		Field newField = getJavaFactory().createField();
-		newField.setName(name);
-		resource.setID(newField, ((JavaClass) getTarget()).getName() + C_CLASS_MEMBER_DELIMITER + name);
-		return newField;
-	}
-	/**
-	 * createJavaMethod - instantiate a Java Method based on the passed Java Model IMethod
-	 * 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 UUID will eventually hold enough info to identify the source, so we use it.
-	 */
-	public Method createJavaMethod(IMethod jdomMethod, XMIResource resource) {
-		Method newMethod = getJavaFactory().createMethod();
-		// We use a simple name, but a complex ID 
-		newMethod.setName(computeMethodName(jdomMethod));
-		resource.setID(newMethod, computeMethodID(jdomMethod, getType(), getTypeResolutionCache()));
-		return newMethod;
-	}
-	protected IPath getBinaryPathFromQualifiedName(String qualifiedName) {
-		return new Path(qualifiedName.replace('.', File.separatorChar) + ".class"); //$NON-NLS-1$
-	}
-	public IType getBinaryType(String qualifiedName) {
-		try {
-			if (getSourceProject() != null) {
-				IJavaElement found = getSourceProject().findElement(getBinaryPathFromQualifiedName(qualifiedName));
-				if (found != null)
-					return ((IClassFile) found).getType();
-			}
-		} catch (JavaModelException jme) {
-			System.out.println(ResourceHandler.getString("Error_Looking_Up_Type_ERROR_", (new Object[] { qualifiedName, jme.getMessage()}))); //$NON-NLS-1$ = "Error looking up type: "
-		}
-		return null;
-	}
-	/**
-	 * Compute a column number from the ISourceRange offset
-	 * Cache the line number thereafter.  Source change will
-	 * Invoke the contentChanged() method.
-	 * Creation date: (8/17/2001 11:16:51 AM)
-	 * @return int
-	 */
-	public int getColNo() {
-
-		synchronized (fLINENOLock) {
-			if (fResolvedColNo == INVALID_LINENO)
-				resolveLineColNo();
-		}
-		return fResolvedColNo;
-	}
-	/**
-	 * Compute a line number from the ISourceRange offset
-	 * Cache the line number thereafter.  Source change will
-	 * Invoke the contentChanged() method.
-	 * Creation date: (8/17/2001 11:16:51 AM)
-	 * @return int
-	 */
-	public int getLineNo() {
-
-		synchronized (fLINENOLock) {
-			if (fResolvedLineNo == INVALID_LINENO)
-				resolveLineColNo();
-		}
-		return fResolvedLineNo;
-	}
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/17/2001 1:18:29 PM)
-	 */
-	public abstract Object getReflectionSource();
-	/* 
-	 * Resolve a type name in the context of a Type.
-	 * (Borrowed from org.eclipse.jdt.ui.codemanipulation.StubUtility.getResolvedTypeName())
-	 * The input is a simple or qualified name, NOT a signature
-	 * The output will be a qualified name, NOT a signature
-	 */
-	public static String getResolvedTypeName(String typeName, IType declaringType) {
-		String name = typeName;
-		try {
-			name = JDOMSearchHelper.resolveSimpleTypeName(declaringType, typeName);
-		} catch (JavaModelException e) {
-			// ignore
-		}
-		return name;
-	}
-
-	protected IJavaProject getSourceProject() {
-		return sourceProject;
-	}
-	protected abstract IType getType();
-	protected abstract Map getTypeResolutionCache();
-
-	public void releaseSourceType() {
-		flushReflectedValuesIfNecessary(true); // induce clients to get Notified.
-	}
-
-	public Notification releaseSourceTypeNoNotification() {
-		return flushReflectedValuesIfNecessaryNoNotification(true); // induce clients to get Notified.
-	}
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/21/2001 8:09:34 AM)
-	 */
-	private void resolveLineColNo() {
-
-		IMember rs = (IMember) getReflectionSource();
-		if (rs != null) {
-			int offset = INVALID_LINENO;
-			try {
-				ISourceRange sr = rs.getNameRange();
-				if (sr.getLength() <= 0)
-					return;
-				offset = sr.getOffset();
-			} catch (JavaModelException je) {
-				return;
-			}
-			ICompilationUnit cu = rs.getCompilationUnit();
-			if (cu != null) {
-				try {
-					IBuffer buffer = cu.getBuffer();
-					computeLineOffset(offset, buffer);
-				} catch (JavaModelException je) {
-				}
-			}
-		}
-	}
-	protected void setSourceProject(IJavaProject workingProject) {
-		sourceProject = workingProject;
-	}
-	/**
-	 * Converts a type signature to a readable string.
-	 *
-	 * Uses Signature.toString(), then tries to undo bad replacement for inner classes.
-	 * 
-	 * Bug: 166226 [https://bugs.eclipse.org/bugs/show_bug.cgi?id=166226]
-	 * Update to use the erasure type from the signature in order to 
-	 * tolerate JDK 5 generics.
-	 *
-	 */
-	public static String signatureToString(String signature) throws IllegalArgumentException {
-		boolean hasDollar = (signature.indexOf(Signature.C_DOLLAR) != -1);
-		//begin 166226 fix
-		String result = Signature.getTypeErasure(signature);
-		result = Signature.toString(result);
-		//end 166226 fix
-		if (hasDollar) {
-			int newPos = result.lastIndexOf("."); //$NON-NLS-1$
-			if (newPos != -1) {
-				result = result.substring(0, newPos) + "$" + result.substring(newPos + 1); //$NON-NLS-1$
-			}
-		}
-		return result;
-	}
-	/**
-	 * setType - set our type here
-	 */
-	protected String typeNameFromSignature(String sig) {
-		return typeNameFromSignature(sig, getType());
-	}
-	/**
-	 * setType - set our type here
-	 */
-	protected String typeNameFromSignature(String sig, IType parent) {
-		return typeNameFromSignature(sig, parent, getTypeResolutionCache());
-	}
-	/**
-	 * setType - set our type here
-	 */
-	public static String typeNameFromSignature(String sig, IType parent, Map typeCache) {
-		String result;
-		String componentSignature = Signature.getElementType(sig);
-		int arrayDimensions = Signature.getArrayCount(sig);
-		result = JDOMSearchHelper.getResolvedTypeName(signatureToString(componentSignature), parent, typeCache);
-		for (int i = 0; i < arrayDimensions; i++) {
-			result = result + "[]"; //$NON-NLS-1$
-		}
-		return result;
-	}
-	/**
-	 * @deprecated
-	 * @see org.eclipse.jem.internal.adapters.jdom.JDOMSearchHelper#findType(String, boolean, IJavaProject, JDOMAdaptor)
-	 */
-	public IType getType(String qualifiedName) {
-		return JDOMSearchHelper.findType(qualifiedName, false, getSourceProject(), this);
-	}
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JDOMClassFinder.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JDOMClassFinder.java
deleted file mode 100644
index 012f6995a..000000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JDOMClassFinder.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.jem.internal.adapters.jdom;
-/*
- *  $RCSfile: JDOMClassFinder.java,v $
- *  $Revision: 1.3 $  $Date: 2005/08/24 21:13:53 $ 
- */
-
-import java.io.File;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jem.internal.java.adapters.nls.ResourceHandler;
-/**
- * Insert the type's description here.
- * Creation date: (8/16/2000 11:06:46 PM)
- * @author: Administrator
- */
-public class JDOMClassFinder {
-	
-	private static JDOMClassFinder instance;
-/**
- * JDOMClassFinder constructor comment.
- */
-public JDOMClassFinder() {
-	super();
-}
-protected IPath getBinaryPathFromQualifiedName(String qualifiedName) {
-	return new Path(qualifiedName.replace('.', File.separatorChar) + ".class");//$NON-NLS-1$
-}
-public IType getBinaryType(String qualifiedName) {
-	try {
-		IJavaElement found = getJavaElement(qualifiedName);
-		return ((IClassFile) found).getType();
-	} catch (JavaModelException jme) {
-		System.out.println(ResourceHandler.getString("Error_Looking_Up_Type_ERROR_", (new Object[] {qualifiedName, jme.getMessage()}))); //$NON-NLS-1$ = "Error looking up type: "
-	}
-	return null;
-}
-public IJavaElement getJavaElement(String qualifiedName) {
-	try {
-		if (getSourceProject() != null)
-			return getSourceProject().findElement(getPathFromQualifiedName(qualifiedName));
-	} catch (JavaModelException jme) {
-		System.out.println(ResourceHandler.getString("Error_Looking_Up_Type_ERROR_", (new Object[] {qualifiedName, jme.getMessage()}))); //$NON-NLS-1$ = "Error looking up type: "
-	}
-	return null;
-}
-protected IPath getPathFromQualifiedName(String qualifiedName) {
-	return new Path(qualifiedName.replace('.', File.separatorChar) + ".java");//$NON-NLS-1$
-}
-protected IJavaProject getSourceProject() {
-	//return (IJavaProject) ((JavaRefPackage)EPackage.Registry.INSTANCE.getEPackage(JavaRefPackage.eNS_URI)).getJavaRefFactory().getJavaContext();
-	return null;
-}
-public IType getType(String qualifiedName) {
-	try {
-		IJavaElement found = getJavaElement(qualifiedName);
-		if (found != null)
-			if (found instanceof IClassFile)
-				return ((IClassFile) found).getType();
-			else
-				if (found instanceof ICompilationUnit) {
-					ICompilationUnit foundCU = (ICompilationUnit) found;
-					// strip the ".java", lifted from CompilationUnit.getMainTypeName()
-					String cuMainTypeName = foundCU.getElementName();
-					cuMainTypeName = cuMainTypeName.substring(0, cuMainTypeName.length() - 5);
-					return foundCU.getType(cuMainTypeName);
-				}
-	} catch (JavaModelException jme) {
-		System.out.println(ResourceHandler.getString("Error_Looking_Up_Type_ERROR_", (new Object[] {qualifiedName, jme.getMessage()}))); //$NON-NLS-1$ = "Error looking up type: "
-	}
-	return null;
-}
-/**
- * Insert the method's description here.
- * Creation date: (8/16/2000 11:19:48 PM)
- * @return com.ibm.etools.java.adapters.JDOMClassFinder
- */
-public static JDOMClassFinder instance() {
-	if (instance == null)
-		instance = new JDOMClassFinder();
-	return instance;
-}
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JDOMSearchHelper.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JDOMSearchHelper.java
deleted file mode 100644
index 7f75aa9ef..000000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JDOMSearchHelper.java
+++ /dev/null
@@ -1,370 +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.adapters.jdom;
-/*
- *  $RCSfile: JDOMSearchHelper.java,v $
- *  $Revision: 1.8 $  $Date: 2006/05/17 20:13:58 $ 
- */
-
-import java.io.File;
-import java.util.*;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.*;
-
-import org.eclipse.jem.internal.java.adapters.nls.ResourceHandler;
-/**
- * Insert the type's description here.
- * Creation date: (9/26/2001 11:09:30 AM)
- * @author: Administrator
- */
-public class JDOMSearchHelper {
-	
-	private static final String RESOLVED_NAME = " :: RESOLVED_NAME :: "; //$NON-NLS-1$
-	private static final String PERIOD = "."; //$NON-NLS-1$
-	private static final String BOOLEAN = "boolean"; //$NON-NLS-1$
-	private static final String BYTE = "byte"; //$NON-NLS-1$
-	private static final String CHAR = "char"; //$NON-NLS-1$
-	private static final String SHORT = "short"; //$NON-NLS-1$
-	private static final String INT = "int"; //$NON-NLS-1$
-	private static final String LONG = "long"; //$NON-NLS-1$
-	private static final String FLOAT = "float"; //$NON-NLS-1$
-	private static final String DOUBLE = "double"; //$NON-NLS-1$
-	private static final String VOID = "void"; //$NON-NLS-1$
-	/**
-	 * JDOMSearchHelper constructor comment.
-	 */
-	public JDOMSearchHelper() {
-		super();
-	}
-	/**
-	 * If the @simpleName is an inner class, we need to resolve only the declaring class.
-	 */
-	private static String[][] getTypeNameInfo(IType type, String simpleName, boolean isForReflection) throws JavaModelException {
-		String[][] result = null;
-		String declaringName, typeName;
-		typeName = simpleName;
-		if (type != null) {
-			if (isForReflection)
-				typeName = typeName.replace('.', '$');
-			int index = typeName.indexOf("$"); //$NON-NLS-1$
-			if (index > 0) {
-				declaringName = typeName.substring(0, index);
-				result = type.resolveType(declaringName);
-				if (result != null) {
-					if (isForReflection)
-						result[0][1] = result[0][1].replace('.', '$');
-					result[0][1] += typeName.substring(index, typeName.length());
-				}
-			} else {
-				index = typeName.indexOf("["); //$NON-NLS-1$
-				if (index > 0) {
-					declaringName = typeName.substring(0, index);
-					result = type.resolveType(declaringName);
-					if (result != null)
-						result[0][1] = result[0][1] + typeName.substring(index);
-				} else
-					result = type.resolveType(typeName);
-			}
-		}
-		return result;
-	}
-	/**
-	 * Returns true if the type is a primitive.
-	 */
-	public final static boolean isPrimitive(String type) {
-		return (BOOLEAN.equals(type) || INT.equals(type) || CHAR.equals(type) || SHORT.equals(type) || LONG.equals(type) || FLOAT.equals(type) || DOUBLE.equals(type) || BYTE.equals(type));
-	}
-	/**
-	 * Returns true if the type is a primitive.
-	 */
-	public final static boolean isPrimitiveOrVoid(String type) {
-		return isPrimitive(type) || isVoid(type);
-	}
-	/**
-	 * Returns true if the type is a primitive.
-	 */
-	public final static boolean isVoid(String type) {
-		return VOID.equals(type);
-	}
-	/**
-	 * Returns true if the two signatures match within the scope of the specified type.
-	 */
-	public static boolean matchTypeSignatures(IType type, String signature1, String signature2) throws JavaModelException {
-		return matchTypeSignatures(type, signature1, signature2, null);
-	}
-	/**
-	 * Returns true if the two signatures match within the scope of the specified type.
-	 */
-	public static boolean matchTypeSignatures(IType type, String signature1, String signature2, Map resolvedNameCache) throws JavaModelException {
-		boolean result = false;
-		String sig1 = signature1;
-		String sig2 = signature2;
-		// First check array count.
-		if (Signature.getArrayCount(sig1) == Signature.getArrayCount(sig2)) {
-			// We have the same array count, get the element types for consideration.
-			sig1 = Signature.getElementType(sig1);
-			sig2 = Signature.getElementType(sig2);
-
-			// There are three cases:
-			//		1) Both are unqualified (both being primitive will fall into this),
-			//		2) Both are qualified, and
-			//		3) One is qualified and the other is not (one could be primitive).
-
-			// For the first two cases a compare of the readable names will always do.
-			if (!((sig1.indexOf('.') == -1) ^ (sig2.indexOf('.') == -1))) {
-				result = Signature.toString(sig1).equals(Signature.toString(sig2));
-			} else {
-				// This is case 3.
-				// First root out one being primitive.
-				if (((sig1.charAt(0) == 'Q') || (sig1.charAt(0) == 'L')) && ((sig2.charAt(0) == 'Q') || (sig2.charAt(0) == 'L'))) {
-					// Get the readable name of the qualified signature
-					// and the simple name of the other.
-					String qualifiedName = null;
-					String simpleName = null;
-					if (sig1.indexOf('.') == -1) {
-						qualifiedName = Signature.toString(sig2);
-						simpleName = Signature.toString(sig1);
-					} else {
-						qualifiedName = Signature.toString(sig1);
-						simpleName = Signature.toString(sig2);
-					}
-
-					// If the simple name resolves to the qualified name, we have a match.
-					result = qualifiedName.equals(resolveSimpleTypeName(type, simpleName, resolvedNameCache));
-				}
-			}
-		}
-
-		return result;
-	}
-	private static boolean needsToResolveName(IType type, String simpleName, boolean isForReflection) {
-		return !(type.isBinary() || (!isForReflection && simpleName.indexOf(PERIOD) > -1) || isPrimitiveOrVoid(simpleName));
-	}
-	/**
-	 * Returns the qualified name for the simple name within the scope of the type.
-	 * Returns null if the name can not be resolved.
-	 */
-	public static String resolveSimpleTypeName(IType type, String simpleName) throws JavaModelException {
-		return resolveSimpleTypeName(type, simpleName, null);
-	}
-	/**
-	 * Returns the qualified name for the simple name within the scope of the type.
-	 * Returns null if the name can not be resolved.
-	 */
-	public static String resolveSimpleTypeName(IType type, String simpleName, Map resolvedNameCache) throws JavaModelException {
-		return resolveSimpleTypeName(type, simpleName, resolvedNameCache, false);
-	}
-
-	/**
-	 * Returns the qualified name for the simple name within the scope of the type.
-	 * Returns null if the name can not be resolved.
-	 */
-	public static String resolveSimpleTypeName(IType type, String simpleName, Map resolvedNameCache, boolean isForReflection) throws JavaModelException {
-		if (!needsToResolveName(type, simpleName, isForReflection))
-			return simpleName;
-		String key = null, qualifiedName = null;
-		if (resolvedNameCache != null) {
-			key = type.getFullyQualifiedName() + RESOLVED_NAME + simpleName;
-			qualifiedName = (String) resolvedNameCache.get(key);
-		}
-		if (qualifiedName == null) {
-			String[][] result = getTypeNameInfo(type, simpleName, isForReflection);
-			if (result != null) {
-				String packName = result[0][0];
-				if (packName.length() == 0) {
-					qualifiedName = result[0][1];
-					if (isForReflection)
-						qualifiedName = qualifiedName.replace('.', '$');					
-				} else {
-					StringBuffer b = new StringBuffer();
-					b.append(result[0][0]).append(PERIOD);
-					String typeName = result[0][1];
-					if (isForReflection)
-						typeName = typeName.replace('.', '$');
-					b.append(typeName);
-					qualifiedName = b.toString();
-				}
-			} else {
-				qualifiedName = simpleName;
-			}
-			if (resolvedNameCache != null)
-				resolvedNameCache.put(key, qualifiedName);
-		}
-		return qualifiedName;
-	}
-	/**
-	 * Searches for a matching method and sets it in the
-	 * descriptor if found.
-	 */
-	public static IMethod searchForMatchingMethod(IType type, String methodName, String[] parmSigs) throws JavaModelException {
-		return searchForMatchingMethod(type, methodName, parmSigs, null);
-	}
-	/**
-	 * Searches for a matching method and sets it in the
-	 * descriptor if found.
-	 */
-	public static IMethod searchForMatchingMethod(IType type, String methodName, String[] parmSigs, Map resolvedNameCache) throws JavaModelException {
-
-		// First get all the methods by this name and with this many parms.
-		IMethod[] allMethods = type.getMethods();
-		List candidateMethods = new ArrayList();
-		for (int i = 0; i < allMethods.length; i++) {
-			int parmSigsLength = (parmSigs != null ? parmSigs.length : 0);
-			if ((allMethods[i].getElementName().equals(methodName)) && (allMethods[i].getNumberOfParameters() == parmSigsLength))
-				candidateMethods.add(allMethods[i]);
-		}
-
-		// For each candidate consider each parm for a match.
-		// Take the first one that matches on all parms.
-		IMethod next = null;
-		String[] nextParmSigs = null;
-		boolean found = false;
-		Iterator candidateIter = candidateMethods.iterator();
-		while (!found && (candidateIter.hasNext())) {
-			next = (IMethod) candidateIter.next();
-			nextParmSigs = next.getParameterTypes();
-			found = true;
-			for (int i = 0;(found && (i < nextParmSigs.length)); i++)
-				found &= matchTypeSignatures(type, parmSigs[i], nextParmSigs[i], resolvedNameCache);
-		}
-		return found ? next : null;
-	}
-
-	/**
-	* The returned Object[] will contain two entries.  The
-	* first will be the IJavaElement that was found and the
-	* second will be the qualifiedName used to find it.
-	*/
-	protected static Object[] findActualJavaElement(String qualifiedName, IJavaProject javaProject, JDOMAdaptor adaptor) {
-		Object[] result = new Object[2];
-		if (adaptor == null)
-			result[1] = qualifiedName;
-		else 
-			//Ensure the name is qualified
-			result[1] = getResolvedTypeName(qualifiedName, adaptor.getType(), adaptor.getTypeResolutionCache());
-		
-		result[0] = findJavaElement((String) result[1], javaProject, adaptor);
-		if (result[0] == null)
-			findInnerJavaElement(result, javaProject, adaptor);
-		return result;
-	}
-
-	/**
-	 * The returned Object[] will contain two entries.  The
-	 * first will be the IJavaElement that was found and the
-	 * second will be the qualifiedName used to find it.
-	 */
-	protected static void findInnerJavaElement(Object[] info, IJavaProject javaProject, JDOMAdaptor adaptor) {
-		String qualifiedName, innerName;
-		qualifiedName = (String) info[1];
-		int index = qualifiedName.lastIndexOf("."); //$NON-NLS-1$
-		if (index > 0) {
-			innerName = qualifiedName.substring(0, index);
-			innerName += "$"; //$NON-NLS-1$
-			innerName += qualifiedName.substring(index + 1, qualifiedName.length());
-			if (adaptor != null) {
-				//Ensure the name is qualified which it may not be if an inner class
-				innerName = getResolvedTypeName(innerName, adaptor.getType(), adaptor.getTypeResolutionCache());
-			}
-			info[1] = innerName;
-			info[0] = findJavaElement(innerName, javaProject, adaptor);
-			if (info[0] == null)
-				findInnerJavaElement(info, javaProject, adaptor);
-		}
-	}
-
-	protected static IJavaElement findJavaElement(String qualifiedName, IJavaProject javaProject, JDOMAdaptor adaptor) {
-		try {
-			if (javaProject != null) {
-				return javaProject.findType(qualifiedName);
-			}
-		} catch (JavaModelException jme) {
-			System.out.println(ResourceHandler.getString("Error_Looking_Up_Type_ERROR_", (new Object[] { qualifiedName, jme.getMessage()}))); //$NON-NLS-1$ = "Error looking up type: "
-		}
-		return null;
-	}
-	
-	protected static IPath getPathFromQualifiedName(String qualifiedName) {
-		return new Path(qualifiedName.replace('.', File.separatorChar) + ".java"); //$NON-NLS-1$
-	}
-	/* 
-	* Resolve a type name in the context of a Type.
-	* (Borrowed from org.eclipse.jdt.ui.codemanipulation.StubUtility.getResolvedTypeName())
-	* The input is a simple or qualified name, NOT a signature
-	* The output will be a qualified name, NOT a signature
-	*/
-	public static String getResolvedTypeName(String typeName, IType declaringType, Map typeCache) {
-		String name = typeName;
-		try {
-			name = JDOMSearchHelper.resolveSimpleTypeName(declaringType, typeName, typeCache, true);
-		} catch (JavaModelException e) {
-			// ignore
-		}
-		return name;
-	}
-
-	public static IType findType(String qualifiedName, boolean useAdvancedForInners, IJavaProject javaProject, JDOMAdaptor adaptor) {
-		try {
-			IJavaElement found = null;
-			String resolvedName = qualifiedName;
-			if (useAdvancedForInners) {
-				Object[] result = findActualJavaElement(qualifiedName, javaProject, adaptor);
-				found = (IJavaElement) result[0];
-				resolvedName = (String) result[1];
-			} else
-				found = findJavaElement(qualifiedName, javaProject, adaptor);
-			if (found != null)
-				if (found instanceof IClassFile)
-					return ((IClassFile) found).getType();
-				else if (found instanceof ICompilationUnit) {
-					ICompilationUnit foundCU = (ICompilationUnit) found;
-					// strip the ".java", lifted from CompilationUnit.getMainTypeName()
-					String cuMainTypeName = foundCU.getElementName();
-					cuMainTypeName = cuMainTypeName.substring(0, cuMainTypeName.length() - 5);
-					return foundCU.getType(cuMainTypeName);
-				} else if (found instanceof IType) {
-					IType type = ((IType) found);
-					if (!type.getFullyQualifiedName('$').equals(resolvedName)) {
-						// I don't know why this is here. Sometime in the past for an inner class, the
-						// IType returned was for the outer class, so you would need to search again
-						// for the inner class against the outer class. I don't know how this now can
-						// happen. The code followed above is extremelly complicated, especially when
-						// it is an inner class that isn't fully-qualified that is inside a source file.
-						// It goes through some gyrations for that. I don't know what it would
-						// return in that case. But just in case, the test is here to be safe.
-						int index = resolvedName.lastIndexOf('$'); //$NON-NLS-1$
-						if (index > -1)
-							return type.getType(resolvedName.substring(index + 1, resolvedName.length()));
-						else
-							return type;
-					} else
-						return type;
-				}
-		} catch (JavaModelException jme) {
-			System.out.println(ResourceHandler.getString("Error_Looking_Up_Type_ERROR_", (new Object[] { qualifiedName, jme.getMessage()}))); //$NON-NLS-1$ = "Error looking up type: "
-		}
-		return null;
-	}
-	
-	public static IType findType(String packageName, String qualifiedTypeName, IJavaProject javaProject) {
-		try {
-			if (javaProject != null) {
-				return javaProject.findType(packageName, qualifiedTypeName.replace('$', '.'));
-			}
-		} catch (JavaModelException jme) {
-			System.out.println(ResourceHandler.getString("Error_Looking_Up_Type_ERROR_", (new Object[] { packageName + "." + qualifiedTypeName, jme.getMessage()}))); //$NON-NLS-1$ //$NON-NLS-2$ = "Error looking up type: "
-		}
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaClassJDOMAdaptor.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaClassJDOMAdaptor.java
deleted file mode 100644
index c3ef86f30..000000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaClassJDOMAdaptor.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
- *******************************************************************************/
-package org.eclipse.jem.internal.adapters.jdom;
-/*
- *  $RCSfile: JavaClassJDOMAdaptor.java,v $
- *  $Revision: 1.27.4.1 $  $Date: 2008/09/10 07:38:59 $ 
- */
-
-import java.util.*;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-import org.eclipse.jdt.core.*;
-
-
-import org.eclipse.jem.internal.java.adapters.*;
-import org.eclipse.jem.internal.java.adapters.nls.ResourceHandler;
-import org.eclipse.jem.internal.plugin.JavaPlugin;
-import org.eclipse.jem.java.*;
-import org.eclipse.jem.java.internal.impl.JavaClassImpl;
-import org.eclipse.jem.util.TimerTests;
-import org.eclipse.jem.util.UIContextDetermination;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-
-public class JavaClassJDOMAdaptor extends JDOMAdaptor implements IJavaClassAdaptor {
-	private static final String OBJECT_TYPE_NAME = "java.lang.Object"; //$NON-NLS-1$
-
-	/*
-	 * Step ids used for TimerTests of performance testing.
-	 */
-	public static final String REFLECT_CLASS = "Reflect JDOM Class"; //$NON-NLS-1$
-	public static final String REFLECT_METHODS = "Reflect all JDOM methods for a class"; //$NON-NLS-1$
-	public static final String REFLECT_FIELDS = "Reflect all JDOM fields for a class"; //$NON-NLS-1$
-	
-	
-	protected IType sourceType = null;
-	protected JavaReflectionAdapterFactory adapterFactory;
-	private Map typeResolutionCache = new HashMap(25);
-	private boolean hasReflectedFields, isReflectingFields;
-	private boolean hasReflectedMethods, isReflectingMethods;
-	
-	public JavaClassJDOMAdaptor(Notifier target, IJavaProject workingProject, JavaReflectionAdapterFactory inFactory) {
-		super(target, workingProject);
-		setAdapterFactory(inFactory);
-	}
-	
-	private Map existingFields = new HashMap(); 
-	/*
-	 * addFields - reflect our fields
-	 */
-	protected boolean addFields() {
-
-		// The algorithm we will use is:
-		// 1) Pass through the IField's of this class
-		//    a) If it is in existingFields, then add to newExisting the entry from
-		//       oldExisting (deleting from oldExisting at the same time), and flush the field. This is so next we re-get any changed parts of it.
-		//    b) else not existing, then create new field and add to the new fields list.
-		// 2) Remove from the fields list any still left in oldExisting. These are ones that no longer exist.
-		// 3) Add all of the news ones to the fields.
-		//       
-		IField[] fields = null;
-		try {
-			fields = getSourceType().getFields();
-		} catch (JavaModelException e) {
-			Logger.getLogger().log(e, Level.WARNING);
-			return false;	
-		}
-		XMIResource resource = (XMIResource) getJavaClassTarget().eResource();		
-		Field field = null;
-		JavaFieldJDOMAdaptor adapter = null;
-		Map newExisting = new HashMap(fields.length);
-		List newFields = new ArrayList();
-		for (int i = 0; i < fields.length; i++) {
-			IField ifield = fields[i];
-			field = (Field) existingFields.remove(ifield);	// Get the existing field (which is the value) from the collection keyed by IField.
-			if (field != null) {
-				// It is an existing method. So just put over to newExisting. Then flush it.
-				newExisting.put(ifield, field);
-				// Since this is a new method, it is not attached to a resource, so we need to explicitly create the adapter.
-				adapter = (JavaFieldJDOMAdaptor) EcoreUtil.getExistingAdapter(field, ReadAdaptor.TYPE_KEY);
-				if (adapter == null)
-					adapter = (JavaFieldJDOMAdaptor) getAdapterFactory().adaptNew(field, ReadAdaptor.TYPE_KEY);
-				else
-					adapter.flushReflectedValuesIfNecessaryNoNotification(true);
-				adapter.setSourceField(ifield);	// Give it this new IField
-			} else {
-				// It is a new method. Create the new method, add to newExisting, and add to newMethods list.
-				field = createJavaField(ifield, resource);
-				newExisting.put(ifield, field);				
-				newFields.add(field);
-				adapter = (JavaFieldJDOMAdaptor) getAdapterFactory().adaptNew(field, ReadAdaptor.TYPE_KEY);
-				if (adapter != null)
-					adapter.setSourceField(ifield);
-			}
-		}
-		
-		BasicEList fieldsList = (BasicEList) getJavaClassTarget().getFieldsGen();
-		if (!existingFields.isEmpty()) {
-			// Now any still left in old existing are deleted. So we make them proxies and then remove them from fields list.			
-			URI baseURI = resource.getURI();
-			Collection toDelete = existingFields.values();
-			for (Iterator itr = toDelete.iterator(); itr.hasNext();) {
-				InternalEObject m = (InternalEObject) itr.next();
-				String id = resource.getID(m);
-				if (id != null)
-					m.eSetProxyURI(baseURI.appendFragment(id));
-			}
-			fieldsList.removeAll(toDelete);
-		}
-		
-		if (!newFields.isEmpty()) {
-			// Now add in the news ones
-			fieldsList.addAllUnique(newFields);
-		}
-		
-		// Finally set current existing to the new map we created.
-		existingFields = newExisting;
-		return true;			
-	}
-	
-	private Map existingMethods = new HashMap(); 
-	/*
-	 * addMethods - reflect our methods. Merge in with the previous.
-	 */
-	protected boolean addMethods() {
-		// The algorithm we will use is:
-		// 1) Pass through the IMethod's of this class
-		//    a) If it is in existingMethods, then add to newExisting the entry from
-		//       oldExisting (deleting from oldExisting at the same time), and flush the method. This is so next we re-get any changed parts of it.
-		//    b) else not existing, then create new method and add to the new methods list.
-		// 2) Remove from the methods list any still left in oldExisting. These are ones that no longer exist.
-		// 3) Add all of the news ones to the methods.
-		//       
-		IMethod[] methods = null;
-		try {
-			methods = getSourceType().getMethods();
-		} catch (JavaModelException e) {
-			Logger.getLogger().log(e, Level.WARNING);
-			return false;	
-		}
-		XMIResource resource = (XMIResource) getJavaClassTarget().eResource();		
-		Method method = null;
-		JavaMethodJDOMAdaptor adapter = null;
-		Map newExisting = new HashMap(methods.length);
-		List newMethods = new ArrayList();
-		for (int i = 0; i < methods.length; i++) {
-			IMethod im = methods[i];
-			method = (Method) existingMethods.remove(im);	// Get the existing method (which is the value) from the collection keyed by IMethod.
-			if (method != null) {
-				// It is an existing method. So just put over to newExisting. Then flush it.
-				newExisting.put(im, method);
-				adapter = (JavaMethodJDOMAdaptor) retrieveAdaptorFrom(method);
-				if (adapter != null) {
-					adapter.flushReflectedValuesIfNecessaryNoNotification(true);
-					adapter.setSourceMethod(im);	// Give it this new IMethod
-				}
-			} else {
-				// It is a new method. Create the new method, add to newExisting, and add to newMethods list.
-				method = createJavaMethod(im, resource);
-				newExisting.put(im, method);				
-				newMethods.add(method);
-				// Since this is a new method, it is not attached to a resource, so we need to explicitly create the adapter.
-				adapter = (JavaMethodJDOMAdaptor) getAdapterFactory().adaptNew(method, ReadAdaptor.TYPE_KEY);
-				if (adapter != null)
-					adapter.setSourceMethod(methods[i]);
-			}
-		}
-		
-		BasicEList methodsList = (BasicEList) getJavaClassTarget().getMethodsGen();
-		if (!existingMethods.isEmpty()) {
-			// Now any still left in old existing are deleted. So we make them proxies and then remove them from methods list.
-			URI baseURI = resource.getURI();
-			Collection toDelete = existingMethods.values();
-			for (Iterator itr = toDelete.iterator(); itr.hasNext();) {
-				InternalEObject m = (InternalEObject) itr.next();
-				String id = resource.getID(m);
-				if (id != null)
-					m.eSetProxyURI(baseURI.appendFragment(id));
-			}
-			methodsList.removeAll(toDelete);
-		}
-		
-		if (!newMethods.isEmpty()) {
-			// Now add in the news ones
-			methodsList.addAllUnique(newMethods);
-		}
-		
-		// Finally set current existing to the new map we created.
-		existingMethods = newExisting;
-		return true;
-	}
-	/**
-	 * Clear source Type ;
-	 */
-	protected void clearSource() {
-		sourceType = null;
-	}
-
-	/**
-	 * Clear the reflected fields list.
-	 */
-	protected boolean flushFields() {
-		// First turn them all into proxies so that any holders will re-resolve to maybe the new one if class comes back.
-		existingFields.clear();
-		XMIResource res = (XMIResource) getJavaClassTarget().eResource();
-		URI baseURI = res.getURI();
-		List fields = getJavaClassTarget().getFieldsGen();
-		int msize = fields.size();
-		for (int i = 0; i < msize; i++) {
-			InternalEObject f = (InternalEObject) fields.get(i);
-			String id = res.getID(f);
-			if (id != null)
-				f.eSetProxyURI(baseURI.appendFragment(id));
-		}
-		fields.clear();	// Now we can clear it.
-		return true;
-		}
-	/**
-	 * Clear the implements list.
-	 */
-	protected boolean flushImplements() {
-		getJavaClassTarget().getImplementsInterfacesGen().clear();
-		return true;
-	}
-	/**
-	 * Clear the reflected methods list.
-	 */
-	protected boolean flushMethods() {
-		// First turn them all into proxies so that any holders will re-resolve to maybe the new one if class comes back.
-		existingMethods.clear();
-		XMIResource res = (XMIResource) getJavaClassTarget().eResource();
-		URI baseURI = res.getURI();
-		List methods = getJavaClassTarget().getMethodsGen();
-		int msize = methods.size();
-		for (int i = 0; i < msize; i++) {
-			InternalEObject m = (InternalEObject) methods.get(i);
-			String id = res.getID(m);
-			if (id != null)
-				m.eSetProxyURI(baseURI.appendFragment(id));
-		}
-		methods.clear();	// Now we can clear it.
-		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;
-	}
-	protected boolean flushInnerClasses() {
-		getJavaClassTarget().getDeclaredClassesGen().clear();
-		return true;
-	}
-	
-	protected boolean flushAndClearCachedModelObject;
-	
-	/**
-	 * Clear the reflected values.
-	 */
-	protected boolean flushReflectedValues(boolean clearCachedModelObject) {
-		flushAndClearCachedModelObject = clearCachedModelObject;
-		return true;
-	}
-	
-	/*
-	 * This is called before a reflect if a real flush is needed.
-	 */
-	private void flushNow() {
-		if (flushAndClearCachedModelObject)
-			setSourceType(null);
-		typeResolutionCache.clear();
-		flushModifiers();
-		flushSuper();
-		flushImplements();
-		if (flushAndClearCachedModelObject) {
-			// Don't flush these yet. We will try to reuse them on the next reflush. If clear model too, then flush them. This usually means class has been deleted, so why keep them around.
-			flushMethods();
-			flushFields();
-		}
-		// Even if we didn't flush the fields/methods, we do need to mark as not reflected so on next usage we will merge in the changes.
-		hasReflectedMethods = false;
-		hasReflectedFields = false;
-		
-		flushInnerClasses();
-		flushAndClearCachedModelObject = false;
-	}
-
-
-	/**
-	 * @see com.ibm.etools.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;
-	}
-	protected JavaReflectionAdapterFactory getAdapterFactory() {
-		return adapterFactory;
-	}
-	/**
-	 * getBinaryType - return the IType which describes our existing Java class file
-	 */
-	protected IType getBinaryType() {
-		return this.getBinaryType(((JavaClass) getTarget()).getQualifiedName());
-	}
-	/**
-	 * 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 IType which describes our existing Java class or source file
-	 */
-	public IType getSourceType() {
-		if (sourceType == null || flushAndClearCachedModelObject) {
-			JavaClassImpl javaClass = (JavaClassImpl) getTarget();
-			sourceType = JDOMSearchHelper.findType(javaClass.getJavaPackage().getName(), javaClass.primGetName(), getSourceProject());
-			/*
-			 * If the sourceType was found and we are not in the middle of
-			 * reflecting it is necessary to ensure that the hasReflected
-			 * is set back to false.  If this is not done then the system
-			 * assumes that the content in the target model object has been
-			 * reflected from this found sourceType which is not the case.
-			 */
-			if (hasValidReflection())
-				flushReflectedValuesIfNecessaryNoNotification(false);
-		}
-		return sourceType;
-	}
-	/**
-	 * getSourceType - return the IType which describes our existing Java class or source file
-	 */
-	protected IType getType() {
-		return getSourceType();
-	}
-	protected Map getTypeResolutionCache() {
-		return typeResolutionCache;
-	}
-	/**
-	 * 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.
-	 */
-	public boolean isSourceTypeFromBinary() {
-		if (getSourceType() == null)
-			return false; //must be new?
-		return getSourceType().isBinary();
-	}
-
-
-	protected JavaClass reflectJavaClass(String qualifiedName) {
-		IType type = JDOMSearchHelper.findType(qualifiedName, true, getSourceProject(), this);
-		if (type != null)
-			return reflectJavaClass(type);
-		else
-			return createJavaClassRef(qualifiedName);
-	}
-	protected JavaClass reflectJavaClass(IType aType) {
-		if (aType != null) {
-			JavaClass javaClass = (JavaClass) JavaRefFactory.eINSTANCE.reflectType(aType.getFullyQualifiedName(), (EObject) getTarget());
-			if (javaClass != null) {
-				JavaClassJDOMAdaptor adaptor = (JavaClassJDOMAdaptor) EcoreUtil.getAdapter(javaClass.eAdapters(), ReadAdaptor.TYPE_KEY);
-				if (adaptor != null)
-					adaptor.setSourceType(aType);
-			}
-			return javaClass;
-		}
-		return null;
-	}
-	/**
-	 * 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 always and the JavaReflectionSynchronizer will flush with the type can
-	 * be found again.  In headless mode, return true only if the type is found.  This is
-	 * needed becauce most headless tasks are done under one operation and the JavaReflectionSynchronizer
-	 * may not have a chance to flush a bad reflection before the real type needs to be found and can be found.
-	 * JavaClass adaptor:
-	 * - set modifiers
-	 * - set name
-	 * - set reference to super
-	 * - create methods
-	 * - create fields
-	 * - add imports
-	 */
-	public boolean reflectValues() {
-		if (hasFlushed) {
-			// We flush sometime in the past since last reflect. So now do the actual flush.
-			flushNow();
-		}
-		super.reflectValues();
-		boolean isHeadless = UIContextDetermination.getCurrentContext() == UIContextDetermination.HEADLESS_CONTEXT;
-		if (canReflect()) {
-			TimerTests.basicTest.startCumulativeStep(REFLECT_CLASS);
-			try {
-				ICompilationUnit cu = getSourceType().getCompilationUnit();
-				boolean isWC = cu != null ? cu.isWorkingCopy() : false;
-				IResource res = isWC ? getSourceType().getResource() : null;
-				// We are only interested in physical classes. If still just in working copy and not yet put out to
-				// disk, we don't should treat as not exist. Anything else is considered existing because we got past
-				// getSourceType.exists. This will return the truth for non-wc. But for wc types it will return true,
-				// even though not physically on disk (such as just creating it and hadn't saved it yet). So for wc types
-				// we need to test the actual resource.
-				// Test is OK if not wc, or if wc, then there is a res. and it is accessible.
-				if (!isWC || (res != null && res.isAccessible())) {
-					setModifiers();
-					setNaming();
-					try {
-						setSuper();
-					} catch (InheritanceCycleException e) {
-						JavaPlugin.getDefault().getLogger().log(e);
-					}
-					setImplements();
-					reflectInnerClasses();
-					setDeclaringClass();
-					//addImports();
-					if (isHeadless) {
-						registerWithFactory();
-						return true;
-					}
-				}
-			} finally {
-				TimerTests.basicTest.stopCumulativeStep(REFLECT_CLASS);
-			}
-		}
-		if (isHeadless)
-			return false;
-		else {
-			registerWithFactory();
-			return true;
-		}
-	}
-	
-	protected void setDeclaringClass() {
-		IType declaringType = getSourceType().getDeclaringType();
-		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();
-			String packageName = declaringType.getPackageFragment().getElementName();
-			JavaClassImpl declaringClass = (JavaClassImpl) JavaRefFactory.eINSTANCE.reflectType(packageName, declaringType.getTypeQualifiedName(), set);
-			declaringClass.getDeclaredClasses();	// This will cause it to put us into its list and also set our declaring class to this declaring type.
-		}
-	}
-	
-	
-	/**
-	 * @return
-	 */
-	private boolean canReflect() {
-		return isResourceLoaded() && getSourceProject() != null && getSourceType() != null && getSourceType().exists();
-	}
-	public synchronized boolean reflectFieldsIfNecessary() {
-		if (reflectValuesIfNecessary() && canReflect()) {
-			if (!hasReflectedFields && !isReflectingFields) {
-				isReflectingFields = true;
-				try {
-					TimerTests.basicTest.startCumulativeStep(REFLECT_FIELDS);
-					addFields();
-					hasReflectedFields = true;
-				} catch (Throwable e) {
-					hasReflectedFields = 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 {
-					isReflectingFields = false;
-					TimerTests.basicTest.stopCumulativeStep(REFLECT_FIELDS);
-				}
-			}
-			return hasReflectedFields;
-		} else
-			return false;	// Couldn't reflect the base values, so couldn't do fields either
-	}
-	public synchronized boolean reflectMethodsIfNecessary() {
-		if (reflectValuesIfNecessary() && canReflect()) {
-			if (!hasReflectedMethods && !isReflectingMethods) {
-				isReflectingMethods = true;
-				try {
-					TimerTests.basicTest.startCumulativeStep(REFLECT_METHODS);
-					hasReflectedMethods = addMethods();
-				} catch (Throwable e) {
-					hasReflectedMethods = 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 {
-					isReflectingMethods = false;
-					if (!hasReflected)
-						flushMethods();	// Something bad happened, so we will do a complete flush to be on safe side.
-					TimerTests.basicTest.stopCumulativeStep(REFLECT_METHODS);
-				}
-			}
-			return hasReflectedMethods;
-		} else
-			return false;	// Couldn't reflect the base values, so couldn't do fields either
-	}
-	
-	private void registerWithFactory() {
-		getAdapterFactory().registerReflection(getJavaClassTarget().getQualifiedNameForReflection(), this);
-	}
-
-	/**
-	 * @see com.ibm.etools.java.adapters.ReflectionAdaptor#notifyChanged(new ENotificationImpl((InternalEObject)Notifier, int,(EStructuralFeature) EObject, Object, Object, int))
-	 */
-	public void notifyChanged(Notification notification) {
-		if (notification.getEventType() == Notification.REMOVING_ADAPTER
-			&& notification.getOldValue() == this
-			&& notification.getNotifier() == getTarget())
-			getAdapterFactory().unregisterReflection(getJavaClassTarget().getQualifiedNameForReflection());
-
-	}
-
-	protected void setAdapterFactory(JavaReflectionAdapterFactory inFactory) {
-		adapterFactory = inFactory;
-	}
-	/**
-	 * setImplements - set our implemented/super interfaces here
-	 * For an interface, these are superclasses.
-	 * For a class, these are implemented interfaces.
-	 */
-	protected void setImplements() {
-		try {
-			String[] interfaceNames = getSourceType().getSuperInterfaceNames();
-			JavaClass ref;
-			// needs work, the names above will be simple names if we are relfecting from a source file
-			List list = getJavaClassTarget().getImplementsInterfacesGen();
-			for (int i = 0; i < interfaceNames.length; i++) {
-				String name = interfaceNames[i];
-				// if a class implements an interface that is actually an inner interface, the inner interface
-				// package is not resolved correctly without getting the fully qualified name. For example,
-				// public class TestBean implements SomeOtherSimpleClass.SomeInterface
-				// without getting the fully qualified name, we are using SomeOtherSimpleClass as the 
-				// package name which is incorrect.
-				String innertypeName = JDOMSearchHelper.getResolvedTypeName(name, getType(), getTypeResolutionCache());
-				if (innertypeName != null) {
-					name = innertypeName;
-				}
-				ref = reflectJavaClass(name);
-				list.add(ref);
-			}
-		} catch (JavaModelException npe) {
-			// name stays null and we carry on
-		}
-	}
-	/**
-	 * setModifiers - set the attribute values related to modifiers here
-	 */
-	protected void setModifiers() {
-		JavaClass javaClassTarget = (JavaClass) getTarget();
-		try {
-			javaClassTarget.setAbstract(Flags.isAbstract(getSourceType().getFlags()));
-			javaClassTarget.setFinal(Flags.isFinal(getSourceType().getFlags()));
-			javaClassTarget.setPublic(Flags.isPublic(getSourceType().getFlags()));
-			// Set type to class or interface, not yet handling EXCEPTION
-			if (getSourceType().isClass())
-				javaClassTarget.setKind(TypeKind.CLASS_LITERAL);
-			else
-				javaClassTarget.setKind(TypeKind.INTERFACE_LITERAL);
-		} catch (JavaModelException npe) {
-			Logger logger = JavaPlugin.getDefault().getLogger();
-			if (logger.isLoggingLevel(Level.WARNING))
-				logger.log(ResourceHandler.getString("Error_Introspecting_Flags_ERROR_", new Object[] { javaClassTarget.getQualifiedName(), npe.getMessage()}), Level.WARNING); //$NON-NLS-1$ = "error introspecting flags on {0}"
-		}
-	}
-	/**
-	 * 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
-	 * 	- null UUID
-	 */
-	protected void setNaming() {
-		/* Naming has been provided by the JavaReflectionKey 
-		JavaClass javaClassTarget = (JavaClass) getTarget();
-		String packageName = getSourceType().getPackageFragment().getElementName();
-		javaClassTarget.refSetUUID((String)null);
-		((XMIResource)javaClassTarget.eResource()).setID(javaClassTarget,getSourceType().getElementName());
-		*/
-	}
-	protected void setSourceType(IType aType) {
-		sourceType = aType;
-	}
-	/**
-	 * setSuper - set our supertype here, implemented interface are handled separately
-	 */
-	protected void setSuper() throws InheritanceCycleException {
-		String superName = null;
-		IType superType = null;
-		try {
-			if (!getSourceType().isInterface()) {
-				superName = getSourceType().getSuperclassName();
-				// binary types will always have fully-qualified super names, so no need to do any searching.
-				if (!getSourceType().isBinary() && superName != null && isTargetInner()) {
-					IType declaringType = getSourceType().getDeclaringType();
-					if (declaringType != null) {
-						//Get all parent InnerTypes
-						IType[] inners = declaringType.getTypes();
-						for (int i = 0; i < inners.length; i++) {
-							IType type = inners[i];
-							if (superName.equals(type.getElementName())) {
-								superName = declaringType.getElementName() + '.' + superName;
-								reflectInnerClasses(declaringType);
-								superType = type;
-								break;
-							}
-						}
-					}
-				}
-				
-				//Source files return null if extends does not exist.
-				if (superName == null && !getSourceType().getFullyQualifiedName().equals(OBJECT_TYPE_NAME))
-					superName = OBJECT_TYPE_NAME;
-				if (superName != null) {
-					JavaClass javaClassTarget = (JavaClass) getTarget();
-					if (superType != null)
-						javaClassTarget.setSupertype(reflectJavaClass(superType));
-					else
-						javaClassTarget.setSupertype(reflectJavaClass(superName));
-				}
-			}
-		} catch (JavaModelException npe) {
-		}
-	}
-	private boolean isTargetInner() {
-		JavaClassImpl javaClass = (JavaClassImpl) getTarget();
-		return (javaClass.getName().indexOf('$') != -1);
-	}
-	/**
-	 * Return true if the sourceType can be found.
-	 */
-	public boolean sourceTypeExists() {
-		return getSourceType() != null;
-	}
-	protected void reflectInnerClasses() {
-		IType[] innerClasses = null;
-		try {
-			innerClasses = getSourceType().getTypes();
-		} catch (JavaModelException e) {
-		}
-		if (innerClasses != null && innerClasses.length != 0) {
-			List declaredClasses = getJavaClassTarget().getDeclaredClassesGen();
-			JavaClass inner;
-			ResourceSet set = getTargetResource().getResourceSet();
-			String packageName = getSourceType().getPackageFragment().getElementName();
-			for (int i = 0; i < innerClasses.length; i++) {
-				inner = (JavaClass) JavaRefFactory.eINSTANCE.reflectType(packageName, innerClasses[i].getTypeQualifiedName(), set);
-				declaredClasses.add(inner);
-			}
-		}
-	}
-	protected void reflectInnerClasses(IType aType) {
-		IType[] innerClasses = null;
-		try {
-			innerClasses = aType.getTypes();
-		} catch (JavaModelException e) {
-		}
-		if (innerClasses != null && innerClasses.length != 0) {
-			ResourceSet set = getTargetResource().getResourceSet();
-			String packageName = aType.getPackageFragment().getElementName();
-			JavaClassImpl parentType = (JavaClassImpl) JavaRefFactory.eINSTANCE.reflectType(packageName, aType.getTypeQualifiedName(), set);
-			List declaredClasses = parentType.getDeclaredClassesGen();
-			JavaClass inner;
-			
-			
-			for (int i = 0; i < innerClasses.length; i++) {
-				inner = (JavaClass) JavaRefFactory.eINSTANCE.reflectType(packageName, innerClasses[i].getTypeQualifiedName(), set);
-				declaredClasses.add(inner);
-			}
-		}
-	}
-	
-	/**
-	 * Test if we have a valid source and has been reflected. This is to only
-	 * to be used by this adapter and by the JDOM adapter factory. It has a 
-	 * very specific meaning and may change as needed. It should not be used
-	 * for any other purpose. It is not an API.
-	 * @return
-	 * 
-	 * @since 1.2.0
-	 */
-	synchronized boolean hasValidReflection() {
-		return sourceType != null && hasReflected && !isReflecting;
-	}
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaFieldJDOMAdaptor.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaFieldJDOMAdaptor.java
deleted file mode 100644
index 6f1fa4b61..000000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaFieldJDOMAdaptor.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.jem.internal.adapters.jdom;
-/*
- *  $RCSfile: JavaFieldJDOMAdaptor.java,v $
- *  $Revision: 1.13.4.1 $  $Date: 2008/09/24 05:41:13 $ 
- */
-import java.util.Map;
-
-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.jdt.core.*;
-
-import org.eclipse.jem.internal.java.adapters.ReadAdaptor;
-import org.eclipse.jem.internal.java.adapters.nls.ResourceHandler;
-import org.eclipse.jem.java.*;
-import org.eclipse.jem.java.internal.impl.FieldImpl;
-/**
- * Insert the type's description here.
- * Creation date: (6/6/2000 4:42:50 PM)
- * @author: Administrator
- */
-public class JavaFieldJDOMAdaptor extends JDOMAdaptor {
-	private static final String BEGIN_COMMENT = "/*"; //$NON-NLS-1$
-	private static final String END_COMMENT = "*/"; //$NON-NLS-1$
-	protected IField sourceField = null;
-	protected IType parentType = null;
-	public JavaFieldJDOMAdaptor(Notifier target, IJavaProject workingProject) {
-		super(target, workingProject);
-	}
-	protected void clearSource() {
-		sourceField = null;
-	}
-	
-	protected boolean flushReflectedValues(boolean clearCachedModelObject) {
-		if (clearCachedModelObject)
-			clearSource();
-		FieldImpl field = getTargetField();
-		field.setInitializer(null);
-		field.setFinal(false);
-		field.setStatic(false);
-		field.setTransient(false);
-		field.setVolatile(false);
-		field.setJavaVisibility(JavaVisibilityKind.PUBLIC_LITERAL);
-		field.setEType(null);
-		return true;
-	}
-	
-	protected void postFlushReflectedValuesIfNecessary(boolean isExisting) {
-		getTargetField().setReflected(false);
-		super.postFlushReflectedValuesIfNecessary(isExisting);
-	}
-	/**
-	 * Return a String for the source starting after the field's name to the end of
-	 * the source range.  This will be the source after the name which could include comments.
-	 */
-	protected String getFieldInitializerSource() {
-		IOpenable openable = getSourceField().getOpenable();
-		try {
-			ISourceRange nameRange, sourceRange;
-			int start = -1, length = 0;
-			IBuffer buffer = openable.getBuffer();
-			if (buffer == null) {
-				return ""; //$NON-NLS-1$
-			}
-			nameRange = getSourceField().getNameRange();
-			start = nameRange.getOffset() + nameRange.getLength();
-			if (start != -1) {
-				sourceRange = getSourceField().getSourceRange();
-				if (sourceRange.getOffset() != -1)
-					length = sourceRange.getOffset() + sourceRange.getLength() - start;
-				return buffer.getText(start, length);
-			}
-			return null;
-		} catch (JavaModelException e) {
-			return ""; //$NON-NLS-1$
-		}
-	}
-	/**
-	 * Return the field source string without comments
-	 */
-	protected String getFieldInitializerSourceWithoutComments() {
-		String s = getFieldInitializerSource();
-		int start = 0;
-		int startComment = -1;
-		int endComment = -1;
-		while (start < s.length()) {
-			startComment = s.indexOf(BEGIN_COMMENT, start);
-			if (startComment > 0) {
-				String newString;
-				endComment = s.indexOf(END_COMMENT, start);
-				newString = s.substring(start, startComment);
-				s = newString + s.substring(endComment + END_COMMENT.length(), s.length());
-				start = 0;
-				startComment = -1;
-				endComment = -1;
-			} else {
-				start = s.length();
-			}
-		}
-		return s;
-	}
-	/**
-	 * getFieldInitializerString - parse the source for our source field 
-	 * 	and return the initialization string.
-	 *  Return null if no initialization string or constant value is present.
-	 * i.e. - public String foo = "foo default"; should return "foo default" (including quotes)
-	 */
-	protected String getFieldInitializerString() {
-		String result = null;
-		try {
-			if (!getParentType().isBinary()) {
-				String source = getFieldInitializerSourceWithoutComments();
-				if (source != null && source.length() != 0) {
-					int equalsPos = source.indexOf('=');//$NON-NLS-1$
-					int endPos = source.indexOf(',');//$NON-NLS-1$
-					if (endPos == -1)
-						endPos = source.length() - 1;
-					if (equalsPos != -1 && equalsPos < endPos) {
-						// Copy from after "=" to before ";" or ","
-						result = source.substring(equalsPos + 1, endPos);
-						result = result.trim();
-					}
-				}
-			} else {
-				// Binary type, see if we can use the constant
-				// it's not clear from the API's, but this is probably only
-				// available for statics.
-				Object constantValue = getSourceField().getConstant();
-				// Need to convert the constant to a String
-				if (constantValue != null) {
-					result = constantValue.toString();
-					if (constantValue instanceof String) {
-						result = "\"" + result + "\""; //$NON-NLS-2$//$NON-NLS-1$
-					}
-				}
-			}
-		} catch (JavaModelException e) {
-			// punt
-		}
-		return result;
-	}
-	/**
-	 * getParentType - return the IType which corresponds to our parent JavaClass
-	 * we're going to do this a lot, so cache it.
-	 */
-	protected IType getParentType() {
-		if (parentType == null) {
-			Field targetField = (Field) getTarget();
-			JavaClass parentJavaClass = targetField.getJavaClass();
-			if (parentJavaClass != null) {
-				JavaClassJDOMAdaptor pa = (JavaClassJDOMAdaptor) 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;
-    }
-	
-	/*
-	 * Used by Java Class JDOM adapter to create and set with a source field
-	 */	
-	public void setSourceField(IField field) {
-		sourceField = field;
-	}	
-	/**
-	 * getSourceField - return the IField which describes our implementing field
-	 */
-	protected IField getSourceField() {
-		if (sourceField == null || !sourceField.exists()) {
-			IType parent = this.getParentType();
-			if (parent != null)
-				sourceField = parent.getField(((Field) getTarget()).getName());
-		}
-		return sourceField;
-	}
-	public FieldImpl getTargetField() {
-		return (FieldImpl) getTarget();
-	}
-	protected IType getType() {
-		return getParentType();
-	}
-	protected Map getTypeResolutionCache() {
-		Field field = getTargetField();
-		if (field != null) {
-			JavaClass javaClass = field.getJavaClass();
-			if (javaClass != null) {
-				JDOMAdaptor classAdaptor = (JDOMAdaptor) retrieveAdaptorFrom(javaClass);
-				if (classAdaptor != null)
-					return classAdaptor.getTypeResolutionCache();
-			}
-		}
-		return null;
-	}
-	/**
-	 * 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() {
-		super.reflectValues();
-		if (isResourceLoaded() && getSourceProject() != null && getSourceField() != null) {
-			setModifiers();
-			//	setNaming();
-			setType();
-			return true;
-		}
-		return false;
-	}
-	/**
-	 * setModifiers - set the attribute values related to modifiers here
-	 */
-	protected void setModifiers() {
-		Field javaFieldTarget = (Field) getTarget();
-		try {
-			String initializer = getFieldInitializerString();
-			if (initializer != null)
-				javaFieldTarget.setInitializer(createBlock(javaFieldTarget.getName(), initializer));
-			int flags = getSourceField().getFlags();
-			javaFieldTarget.setFinal(Flags.isFinal(flags));
-			javaFieldTarget.setStatic(Flags.isStatic(flags));
-			javaFieldTarget.setTransient(Flags.isTransient(flags));
-			javaFieldTarget.setVolatile(Flags.isVolatile(flags));
-			// Set visibility
-			if (Flags.isPublic(flags))
-				javaFieldTarget.setJavaVisibility(JavaVisibilityKind.PUBLIC_LITERAL);
-			else if (Flags.isPrivate(flags))
-				javaFieldTarget.setJavaVisibility(JavaVisibilityKind.PRIVATE_LITERAL);
-			else if (Flags.isProtected(flags))
-				javaFieldTarget.setJavaVisibility(JavaVisibilityKind.PROTECTED_LITERAL);
-			else
-				javaFieldTarget.setJavaVisibility(JavaVisibilityKind.PACKAGE_LITERAL);
-		} catch (JavaModelException npe) {
-			System.out.println(ResourceHandler.getString("Error_Introspecting_Flags_ERROR_", new Object[] {((XMIResource) javaFieldTarget.eResource()).getID(javaFieldTarget), npe.getMessage()})); //$NON-NLS-1$ = "error introspecting flags on {0}"
-		}
-	}
-	/**
-	 * setNaming - set the naming values here
-	 * 	- qualified name must be set first, that is the path to the real Java class
-	 *	- ID
-	 * 	- null UUID
-	 */
-	protected void setNaming() {
-		Field javaFieldTarget = (Field) getTarget();
-		JavaClass parent = javaFieldTarget.getContainingJavaClass();
-		((XMIResource) javaFieldTarget.eResource()).setID(javaFieldTarget, parent.getName() + "_" + javaFieldTarget.getName()); //$NON-NLS-1$
-	}
-	/**
-	 * setType - set our type here
-	 */
-	protected void setType() {
-		String typeName = null;
-		try {
-			typeName = typeNameFromSignature(getSourceField().getTypeSignature());
-		} catch (JavaModelException npe) {
-			// name stays null and we carry on
-		}
-		setFieldType(getTargetField(), typeName);
-	}
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaJDOMAdapterFactory.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaJDOMAdapterFactory.java
deleted file mode 100644
index db28c0a25..000000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaJDOMAdapterFactory.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.jem.internal.adapters.jdom;
-/*
- *  $RCSfile: JavaJDOMAdapterFactory.java,v $
- *  $Revision: 1.10 $  $Date: 2006/09/14 18:31:08 $ 
- */
-import java.util.*;
-
-import org.eclipse.emf.common.notify.*;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jem.internal.java.adapters.*;
-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 JavaJDOMAdapterFactory extends JavaReflectionAdapterFactory {
-	
-	protected JavaReflectionSynchronizer synchronizer;
-	protected IJavaProject javaProject;
-/**
- * JavaJDOMAdapterFactory constructor comment.
- */
-public JavaJDOMAdapterFactory() {
-	super();
-}
-/**
- * JavaJDOMAdapterFactory constructor comment.
- */
-public JavaJDOMAdapterFactory(IJavaProject aJavaProject) {
-	this();
-	setJavaProject(aJavaProject);
-}
-protected ReflectionAdaptor createJavaClassAdaptor(Notifier target) {
-	return new JavaClassJDOMAdaptor(target, getJavaProject(), this);
-}
-protected ReflectionAdaptor createJavaFieldAdaptor(Notifier target) {
-	return new JavaFieldJDOMAdaptor(target, getJavaProject());
-}
-protected ReflectionAdaptor createJavaMethodAdaptor(Notifier target) {
-	return new JavaMethodJDOMAdaptor(target, getJavaProject());
-}
-/**
- *  Flush ALL adapters, worst case
- * We also want to ensure that the source types are also cleared
- * in this worst case scenario.
- */
-public void flushAll() {
-	doFlush(reflected.values(),true, true);
-}
-
-public List flushAllNoNotification() {
-	return doFlush(reflected.values(),true, false);
-}
-
-public void flushPackage(String packageName, boolean noFlushIfSourceFound) {
-	List adaptors = getReflectedForPackage(packageName, noFlushIfSourceFound);
-	doFlush(adaptors, true, true);
-}
-public List flushPackageNoNotification(String packageName, boolean noFlushIfSourceFound) {
-	List adaptors = getReflectedForPackage(packageName, noFlushIfSourceFound);
-	return doFlush(adaptors, true, false);
-}
-/**
- * Return a List of reflection adaptors that belong to 
- * the packageName.
- * @param packageName
- * @return
- */
-private List getReflectedForPackage(String packageName, boolean filterFoundTypes) {
-	if (packageName != null && !reflected.isEmpty()) {
-		isBusyIteratingReflected = true;
-		List result = null;
-		try {
-			Iterator it = reflected.entrySet().iterator();
-			Map.Entry entry;
-			String key;
-			JavaClassJDOMAdaptor adaptor;
-			while (it.hasNext()) {
-				entry = (Map.Entry) it.next();
-				adaptor = (JavaClassJDOMAdaptor) entry.getValue();
-				/*
-				 * Ensure that the the adaptor is only filtered out if it has
-				 * actually reflected the content.  It is not good enough just
-				 * to test for the sourceType.
-				 */
-				if (filterFoundTypes && adaptor.hasValidReflection())
-					continue;
-				key = (String) entry.getKey();
-				if (key.startsWith(packageName) && key.indexOf('.', packageName.length() + 1) < 0) {
-					if (result == null)
-						result = new ArrayList();
-					result.add(entry.getValue());
-				}	
-			}
-		} finally {
-			finishedIteratingReflected();
-		}
-		if (result != null)
-			return result;
-	}
-	return Collections.EMPTY_LIST;
-}
-private List doFlush(Collection adaptors, boolean clearSourceType, boolean doNotify) {
-	if (!adaptors.isEmpty()) {
-		isBusyIteratingReflected = true;
-		List notifications = doNotify ? null : new ArrayList(adaptors.size());
-		try {
-			Notification notification;
-			Iterator i = adaptors.iterator();
-			JDOMAdaptor adaptor;
-			while (i.hasNext()) {
-				adaptor = (JDOMAdaptor) i.next();
-				if (doNotify)
-					adaptor.flushReflectedValuesIfNecessary(clearSourceType);
-				else {
-					notification = adaptor.flushReflectedValuesIfNecessaryNoNotification(clearSourceType);
-					if (notification != null)
-						notifications.add(notification);
-				}
-			}
-		} finally {
-			finishedIteratingReflected();
-		}
-		return notifications;
-	}
-	return Collections.EMPTY_LIST;
-}
-// Flush the adapter for a source object
-public void flushReflection(String source) {
-	JDOMAdaptor a = (JDOMAdaptor) reflected.get(source);
-	if (a != null)
-		a.flushReflectedValuesIfNecessary();
-}
-public Notification flushReflectionNoNotification(String source) {
-	JDOMAdaptor a = (JDOMAdaptor) reflected.get(source);
-	if (a != null)
-		return a.flushReflectedValuesIfNecessaryNoNotification(false);
-	return null;
-}
-
-public Notification flushReflectionPlusInnerNoNotification(String source) {
-	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 (notification == null)
-						notification = adaptor.flushReflectedValuesIfNecessaryNoNotification(false);
-					else
-						((NotificationChain) notification).add(adaptor.flushReflectedValuesIfNecessaryNoNotification(false));
-				}
-			}
-		}
-	} finally {
-		finishedIteratingReflected();
-	}
-	return notification;
-
-}
-/**
- * Insert the method's description here.
- * Creation date: (11/2/2000 3:02:31 PM)
- * @return org.eclipse.jdt.core.api.IJavaProject
- */
-public IJavaProject getJavaProject() {
-	return javaProject;
-}
-/**
- * Create a Java Model listener which will flush invalidated adaptors.
- * This will cause those adapters to re-reflect their target object's contents.
- */
-protected void initializeSynchronizer() {
-	synchronizer = new JavaReflectionSynchronizer(this);
-}
-/**
- * Notify all JDOMAdapters which use the same target ICompilationUnit
- * Creation date: (8/17/2001 4:45:43 PM)
- */
-public void notifyContentChanged(ICompilationUnit targetCU) {
-
-	if (targetCU == null || reflected.values()==null) return ;
-	isBusyIteratingReflected = true;
-	try {
-		Iterator i = reflected.values().iterator();
-		while (i.hasNext()) {
-			Object a = i.next() ;
-			if (a instanceof JDOMAdaptor) {
-				JDOMAdaptor adaptor = (JDOMAdaptor) a;
-				IMember reflectionSource = (IMember) adaptor.getReflectionSource();
-				ICompilationUnit adapterCU = null ;
-				if (reflectionSource != null) {
-					try {
-					   adapterCU = reflectionSource.getCompilationUnit();
-					} catch (Throwable e) {} 
-				}
-				if (adapterCU != null && targetCU.equals(adapterCU)) {
-			       adaptor.contentChanged();
-				}
-			}
-		}
-	} finally {
-		finishedIteratingReflected();  	
-	}
-}
-/**
- * Insert the method's description here.
- * Creation date: (11/2/2000 3:02:31 PM)
- * @param newJavaProject org.eclipse.jdt.core.IJavaProject
- */
-public void setJavaProject(IJavaProject newJavaProject) {
-	javaProject = newJavaProject;
-	if (newJavaProject != null && synchronizer == null)
-		initializeSynchronizer();
-}
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaMethodJDOMAdaptor.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaMethodJDOMAdaptor.java
deleted file mode 100644
index 6bbd7c240..000000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaMethodJDOMAdaptor.java
+++ /dev/null
@@ -1,470 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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: JavaMethodJDOMAdaptor.java,v $
- *  $Revision: 1.15.2.1.2.1 $  $Date: 2009/10/01 22:01:27 $ 
- */
-package org.eclipse.jem.internal.adapters.jdom;
-
-import java.util.List;
-import java.util.Map;
-
-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.jdt.core.*;
-
-import org.eclipse.jem.internal.java.adapters.IJavaMethodAdapter;
-import org.eclipse.jem.internal.java.adapters.ReadAdaptor;
-import org.eclipse.jem.internal.java.adapters.nls.ResourceHandler;
-import org.eclipse.jem.java.*;
-import org.eclipse.jem.java.internal.impl.MethodImpl;
-import org.eclipse.jem.util.TimerTests;
-
-/**
- * Java Method Reflection Adapter for JDOM (i.e. JDT model)
- * Creation date: (6/6/2000 4:42:50 PM)
- * @author: Administrator
- */
-public class JavaMethodJDOMAdaptor extends JDOMAdaptor implements IJavaMethodAdapter  {
-
-	/*
-	 * Step ids used for TimerTests of performance testing.
-	 */
-	public static final String REFLECT_METHOD = "Reflect JDOM Method"; //$NON-NLS-1$
-
-	protected IMethod sourceMethod = null;
-
-	protected IType parentType = null;
-
-	public JavaMethodJDOMAdaptor(Notifier target, IJavaProject workingProject) {
-		super(target, workingProject);
-	}
-
-	
-	protected boolean flushReflectedValues(boolean clearCachedModelObject) {
-		if (clearCachedModelObject)
-			clearSource();
-		MethodImpl method = (MethodImpl) getTarget();
-		method.setIsGenerated(false);
-		method.setFinal(false);
-		method.setNative(false);
-		method.setStatic(false);
-		method.setSynchronized(false);
-		method.setConstructor(false);
-		method.setAbstract(false);
-		method.setJavaVisibility(JavaVisibilityKind.PUBLIC_LITERAL);
-		method.setEType(null);
-		method.getParametersGen().clear();
-		method.getJavaExceptionsGen().clear();		
-		parentType = null;
-		return true;
-	}
-	
-	protected void postFlushReflectedValuesIfNecessary(boolean isExisting) {
-		((MethodImpl) getTarget()).setReflected(false);
-		super.postFlushReflectedValuesIfNecessary(isExisting);
-	}	
-	/**
-	 * addExceptions - reflect our exception list
-	 */
-	protected void addExceptions() {
-		try {
-			IMethod sourceMethod = getSourceMethod();
-			String[] exceptionNames = sourceMethod.getExceptionTypes();
-			List exceptions = ((MethodImpl) getTarget()).getJavaExceptionsGen();
-			for (int i = 0; i < exceptionNames.length; i++) {
-				exceptions.add(createJavaClassRef(typeNameFromSignature(exceptionNames[i])));
-			}
-		} catch (JavaModelException npe) {
-			// name stays null and we carry on
-		}
-	}
-	
-	
-	protected String[] getParameterNames() {
-		String[] parmNames = new String[0], parmTypeNames = getSourceMethod().getParameterTypes();
-		try {
-			parmNames = getSourceMethod().getParameterNames();
-		} catch (JavaModelException npe) {
-			// name stays null and we carry on
-		}
-		// Temp hack to work around a JavaModel bug, above call on a Binary method may return null
-		if (parmNames == null || parmNames.length == 0) {
-			parmNames = new String[parmTypeNames.length];
-			for (int i = 0; i < parmTypeNames.length; i++) {
-				parmNames[i] = "arg" + i;//$NON-NLS-1$
-			}
-		}	
-		return parmNames;
-	}
-
-	/**
-	 * addParameters - reflect our parms
-	 */
-	protected void addParameters() {
-		String[] parmTypeNames = getSourceMethod().getParameterTypes();
-		MethodImpl javaMethodTarget = (MethodImpl) getTarget();
-		List params = javaMethodTarget.getParametersGen();
-		for (int i = 0; i < parmTypeNames.length; i++) {
-			params.add(createJavaParameter(javaMethodTarget, null, typeNameFromSignature(parmTypeNames[i])));
-		}
-	}
-
-	protected void clearSource() {
-		sourceMethod = null;
-	}
-
-	protected JavaClass getContainingJavaClass() {
-		return ((Method) getTarget()).getContainingJavaClass();
-	}
-
-	/**
-	 * getParentType - return the IType which corresponds to our parent JavaClass we're going to do this a lot, so cache it.
-	 */
-	protected IType getParentType() {
-		if (parentType == null) {
-			Method targetMethod = (Method) getTarget();
-			if(targetMethod != null){
-				JavaClass parentJavaClass = targetMethod.getContainingJavaClass();
-				JavaClassJDOMAdaptor pa = (JavaClassJDOMAdaptor) EcoreUtil.getAdapter(parentJavaClass.eAdapters(), ReadAdaptor.TYPE_KEY);
-				if (pa != null)
-					parentType = pa.getSourceType();
-			}
-		}
-		return parentType;
-	}
-
-	/**
-	 * getParmTypeSignatures - return an array of Strings (in Signature format) for our parameter types For reflection purposes, we can only rely on
-	 * our UUID, since our parms may not yet be known. see org.eclipse.jdt.core.SourceMapper.convertTypeNamesToSigs()
-	 */
-	protected String[] getParmTypeSignatures() {
-		Method javaMethodTarget = (Method) getTarget();
-		String[] typeNames = getTypeNamesFromMethodID(((XMIResource) javaMethodTarget.eResource()).getID(javaMethodTarget));
-		if (typeNames == null)
-			return emptyStringArray;
-		int n = typeNames.length;
-		if (n == 0)
-			return emptyStringArray;
-		String[] typeSigs = new String[n];
-		try {
-			for (int i = 0; i < n; ++i) {
-				typeSigs[i] = Signature.createTypeSignature(new String(typeNames[i]), getParentType().isBinary());
-			}
-		} catch (IllegalArgumentException e) {
-			e.printStackTrace();
-		}
-		return typeSigs;
-	}
-
-	public Object getReflectionSource() {
-		return getSourceMethod();
-	}
-	
-    /* (non-Javadoc)
-     * @see org.eclipse.jem.internal.java.adapters.JavaReflectionAdaptor#hasReflectionSource()
-     */
-    public boolean hasCachedReflectionSource() {
-        return sourceMethod != null;
-    }
-
-	/*
-	 * Used by Java Class JDOM adapter to create and set with a source method/
-	 */	
-	public void primSetMethod(IMethod method) {
-		sourceMethod = method;
-	}
-	/**
-	 * getsourceMethod - return the IMethod which describes our implementing method
-	 */
-	public IMethod getSourceMethod() {
-		if ((sourceMethod == null) || (!sourceMethod.exists())) {
-			try {
-				IType parent = this.getParentType();
-				if (parent != null) {
-					String[] parmNames = this.getParmTypeSignatures();
-					sourceMethod = JDOMSearchHelper.searchForMatchingMethod(parent, ((Method) getTarget()).getName(), parmNames);
-				}
-			} catch (JavaModelException e) {
-				//do nothing
-			}
-		}
-		return sourceMethod;
-	}
-
-	protected IType getType() {
-		return getParentType();
-	}
-
-	protected Map getTypeResolutionCache() {
-		Method method = (Method) getTarget();
-		if (method != null) {
-			JavaClass javaClass = method.getJavaClass();
-			if (javaClass != null) {
-				JDOMAdaptor classAdaptor = (JDOMAdaptor) retrieveAdaptorFrom(javaClass);
-				if (classAdaptor != null)
-					return classAdaptor.getTypeResolutionCache();
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * 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() {
-		super.reflectValues();
-		try {
-			TimerTests.basicTest.startCumulativeStep(REFLECT_METHOD);
-			if (isResourceLoaded() && getSourceProject() != null && getSourceMethod() != null && sourceMethod.exists()) {
-				setModifiers();
-				setNaming();
-				setReturnType();
-				addParameters();
-				addExceptions();
-				return true;
-			}
-		} finally {
-			TimerTests.basicTest.stopCumulativeStep(REFLECT_METHOD);
-		}
-		return false;
-	}
-
-	/**
-	 * Set the generated flag if @generated is found in the source.
-	 */
-	protected void setGeneratedFlag() {
-		Method methodTarget = (Method) getTarget();
-		try {
-			String source = getSourceMethod().getSource();
-			if (source != null) {
-				int index = source.indexOf(Method.GENERATED_COMMENT_TAG);
-				if (index > 0)
-					methodTarget.setIsGenerated(true);
-			}
-		} catch (JavaModelException npe) {
-			//System.out.println(ResourceHandler.getString("Error_Setting_GenFlag_ERROR_", new Object[]
-			// {((XMIResource)methodTarget.eResource()).getID(methodTarget), npe.getMessage()})); //$NON-NLS-1$ = "error setting the generated flag on
-			// {0}, exception: {1}"
-		}
-	}
-
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.java.adapters.IJavaMethodAdapter#reflectGeneratedIfNecessary()
-	 */
-	public boolean reflectGeneratedIfNecessary() {
-		if (reflectValuesIfNecessary()) {
-			setGeneratedFlag();
-			return true;
-		}
-		return false;
-	}
-	
-	public boolean reflectParamNamesIfNecessary() {
-		if (reflectValuesIfNecessary()) {
-			String [] paramNames = getParameterNames();
-			List param = ((MethodImpl)getTarget()).getParameters();
-			for (int i = 0; i < paramNames.length; i++) {
-				((JavaParameter)param.get(i)).setName(paramNames[i]);				
-			}
-			return true;
-		}
-		return false;
-	}
-	/**
-	 * setModifiers - set the attribute values related to modifiers here
-	 */
-	protected void setModifiers() {
-		Method methodTarget = (Method) getTarget();
-		try {
-			methodTarget.setFinal(Flags.isFinal(getSourceMethod().getFlags()));
-			methodTarget.setNative(Flags.isNative(getSourceMethod().getFlags()));
-			methodTarget.setStatic(Flags.isStatic(getSourceMethod().getFlags()));
-			methodTarget.setSynchronized(Flags.isSynchronized(getSourceMethod().getFlags()));
-			methodTarget.setConstructor(getSourceMethod().isConstructor());
-
-			JavaClass javaClass = getContainingJavaClass();
-			//Set abstract
-			if (javaClass.getKind().getValue() == TypeKind.INTERFACE)
-				methodTarget.setAbstract(true);
-			else
-				methodTarget.setAbstract(Flags.isAbstract(getSourceMethod().getFlags()));
-			// Set visibility
-			if (javaClass.getKind().getValue() == TypeKind.INTERFACE || Flags.isPublic(getSourceMethod().getFlags()))
-				methodTarget.setJavaVisibility(JavaVisibilityKind.PUBLIC_LITERAL);
-			else if (Flags.isPrivate(getSourceMethod().getFlags()))
-				methodTarget.setJavaVisibility(JavaVisibilityKind.PRIVATE_LITERAL);
-			else if (Flags.isProtected(getSourceMethod().getFlags()))
-				methodTarget.setJavaVisibility(JavaVisibilityKind.PROTECTED_LITERAL);
-			else
-				//Visibility must be package
-				methodTarget.setJavaVisibility(JavaVisibilityKind.PACKAGE_LITERAL);
-		} catch (JavaModelException npe) {
-			System.out
-					.println(ResourceHandler
-							.getString(
-									"Error_Introspecting_Flags_ERROR_", (new Object[] { ((XMIResource) methodTarget.eResource()).getID(methodTarget), npe.getMessage()}))); //$NON-NLS-1$ = "error introspecting flags on {0}, exception: {1}"
-		}
-	}
-
-	/**
-	 * 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() {
-		String typeName = null;
-		try {
-			typeName = typeNameFromSignature(getSourceMethod().getReturnType());
-		} catch (JavaModelException npe) {
-			// name stays null and we carry on
-		}
-		if (typeName != null) {
-			Method javaMethodTarget = (Method) getTarget();
-			javaMethodTarget.setEType(createJavaClassRef(typeName));
-		}
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (10/3/2001 10:08:34 AM)
-	 * 
-	 * @param newSourceMethod
-	 *            org.eclipse.jdt.core.IMethod
-	 */
-	public void setSourceMethod(org.eclipse.jdt.core.IMethod newSourceMethod) {
-		sourceMethod = newSourceMethod;
-	}
-	
-	/*
-	 * Override to tolerate JDK 5 variable types.
-	 * @see org.eclipse.jem.internal.adapters.jdom.JDOMAdaptor#typeNameFromSignature(java.lang.String)
-	 */
-	protected String typeNameFromSignature(String typeSignature) {
-		String erasure = null;
-		try {
-			erasure = Signature.getTypeErasure(typeSignature);
-		} catch (IllegalArgumentException e) {
-			//The signature is not the correct format for a variable.
-		}
-		if (erasure != null) {
-			String variableName = null;
-			String resolvedVariable = null;
-			
-			int arrayCount = Signature.getArrayCount(erasure);
-			if (arrayCount > 0) {
-				//We have an array.  Check if the element type is a variable.
-				String elementTypeName = Signature.getElementType(erasure);
-				variableName = Signature.toString(elementTypeName);
-				resolvedVariable = resolveVariableName(erasure, variableName);
-				if (resolvedVariable != null) {
-					//Add array info.
-					StringBuffer b = new StringBuffer(resolvedVariable);
-					for (int i = 0; i < arrayCount; i++) {
-						b.append("[]"); //$NON-NLS-1$
-					}
-					resolvedVariable = b.toString();
-				}
-			} else {
-				variableName = Signature.toString(erasure);
-				//Need to resolve the variable.
-				resolvedVariable = resolveVariableName(erasure, variableName);
-			}
-			if (resolvedVariable == null) {
-				return super.typeNameFromSignature(erasure);
-			} else {
-				return resolvedVariable;
-			}
-		}
-		return super.typeNameFromSignature(typeSignature);
-	}
-
-
-	private String resolveVariableName(String erasure, String variableName) {
-		IMethod method = getSourceMethod();
-		ITypeParameter[] typeParameters = null;
-		try {
-			typeParameters = method.getTypeParameters();
-		} catch (JavaModelException e1) {
-			//Failed to retrieve type parameters for any number of reasons.
-		}
-		ITypeParameter typeParam = null;
-		if (typeParameters != null && typeParameters.length > 0) {
-			for (int i = 0; i < typeParameters.length; i++) {
-				if (typeParameters[i].exists() && variableName.equals(typeParameters[i].getElementName())) {
-					typeParam = typeParameters[i];
-					break;
-				}
-			}
-			if (typeParam != null) {
-				String[] bounds = null;
-				try {
-					bounds = typeParam.getBounds();
-				} catch (JavaModelException e) {}
-				if (bounds != null && bounds.length > 0) {
-					return JDOMSearchHelper.getResolvedTypeName(bounds[0], getType(), getTypeResolutionCache());
-				} else {
-					return "java.lang.Object";
-				}
-			}
-		}
-
-		IJavaElement parent = method.getParent();
-		if (parent instanceof IType)
-		{
-			try {
-				typeParameters = ((IType)parent).getTypeParameters();
-			} catch (JavaModelException e1) {
-				//Failed to retrieve type parameters for any number of reasons.
-			}
-		}
-		if (typeParameters != null && typeParameters.length > 0) {
-			for (int i = 0; i < typeParameters.length; i++) {
-				if (typeParameters[i].exists() && variableName.equals(typeParameters[i].getElementName())) {
-					typeParam = typeParameters[i];
-					break;
-				}
-			}
-			if (typeParam != null) {
-				String[] bounds = null;
-				try {
-					bounds = typeParam.getBounds();
-				} catch (JavaModelException e) {}
-				if (bounds != null && bounds.length > 0) {
-					return JDOMSearchHelper.getResolvedTypeName(bounds[0], getType(), getTypeResolutionCache());
-				} else {
-					return "java.lang.Object";
-				}
-			}
-		}
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaModelListener.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaModelListener.java
deleted file mode 100644
index 9ab07af59..000000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaModelListener.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.adapters.jdom;
-/*
- *  $RCSfile: JavaModelListener.java,v $
- *  $Revision: 1.11 $  $Date: 2006/05/17 20:13:58 $ 
- */
-
-
-/**
- * Insert the type's description here.
- * Creation date: (10/31/2000 1:13:12 PM)
- * @author: Administrator
- * @deprecated Use {@link org.eclipse.jem.workbench.utility.JavaModelListener} instead.
- */
-public abstract class JavaModelListener extends org.eclipse.jem.workbench.utility.JavaModelListener {
-
-	/**
-	 * 
-	 * 
-	 * @since 1.2.0
-	 */
-	public JavaModelListener() {
-		super();
-	}
-
-	/**
-	 * @param eventsToListen
-	 * 
-	 * @since 1.2.0
-	 */
-	public JavaModelListener(int eventsToListen) {
-		super(eventsToListen);
-	}
-	
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaReflectionSynchronizer.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaReflectionSynchronizer.java
deleted file mode 100644
index d4dcd0dc9..000000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaReflectionSynchronizer.java
+++ /dev/null
@@ -1,347 +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.adapters.jdom;
-/*
- *  $RCSfile: JavaReflectionSynchronizer.java,v $
- *  $Revision: 1.19 $  $Date: 2006/09/18 22:18:02 $ 
- */
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.jdt.core.*;
-
-import org.eclipse.jem.internal.plugin.JavaPlugin;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JavaModelListener;
-
-/**
- * Insert the type's description here.
- * Creation date: (11/1/2000 11:42:05 AM)
- * @author: Administrator
- */
-public class JavaReflectionSynchronizer extends JavaModelListener {
-	
-	protected JavaJDOMAdapterFactory fAdapterFactory;
-
-	protected boolean flushedAll = false;
-	protected List flushTypes = new ArrayList();
-	protected List flushTypePlusInner = new ArrayList();
-	protected List notifications = new ArrayList();
-	/**
-	 * JavaReflectionSynchronizer constructor comment.
-	 */
-	public JavaReflectionSynchronizer(JavaJDOMAdapterFactory synchronizee) {
-		super();
-		fAdapterFactory = synchronizee;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.adapters.jdom.JavaModelListener#getJavaProject()
-	 */
-	protected IJavaProject getJavaProject() {
-		return getAdapterFactory().getJavaProject();
-	}	
-	/**
-	 * Tell the reflection factory to flush the passed IType
-	 */
-	protected Notification doFlush(IType element) {
-		return getAdapterFactory().flushReflectionNoNotification(element.getFullyQualifiedName());
-	}
-	
-	/*
-	 * Flush the compilation unit and any inner classes since we don't if they may or may not of changed.
-	 */
-	protected Notification doFlush(ICompilationUnit element) {
-		return getAdapterFactory().flushReflectionPlusInnerNoNotification(getFullNameFromElement(element));
-	}
-	
-	protected void flush(IType element) {
-		if (!flushTypes.contains(element))
-			flushTypes.add(element);
-	}
-	/*
-	 * flush the compilation unit. Since we don't know if inner classes may also
-	 * of been affected, they to will be flushed.
-	 */
-	protected void flush(ICompilationUnit element) {
-		if (!flushTypePlusInner.contains(element))
-			flushTypePlusInner.add(element);		
-	}
-	protected void flushPackage(String packageName, boolean noFlushIfSourceFound) {
-		notifications.addAll(getAdapterFactory().flushPackageNoNotification(packageName, noFlushIfSourceFound));
-	}
-	protected JavaJDOMAdapterFactory getAdapterFactory() {
-		return fAdapterFactory;
-	}
-	
-	/**
-	 * Handle the change for a single element, children will be handled separately.
-	 *
-	 */
-	protected void processJavaElementChanged(ICompilationUnit element, IJavaElementDelta delta) {
-		switch (delta.getKind()) {
-			case IJavaElementDelta.CHANGED : {
-				// A file save had occurred. It doesn't matter if currently working copy or not.
-				// It means something has changed to the file on disk, but don't know what.
-				if ((delta.getFlags() & IJavaElementDelta.F_PRIMARY_RESOURCE) != 0) {
-					flush(element);	// Flush everything, including inner classes.					
-				} else if ((delta.getFlags() & IJavaElementDelta.F_CONTENT) == 0 && 
-						(delta.getFlags() & IJavaElementDelta.F_CHILDREN) != 0)  //A type may have been added or removed.
-					processChildren(element, delta);
-				break;
-			}
-			case IJavaElementDelta.REMOVED :
-			case IJavaElementDelta.ADDED :
-				if (!element.isWorkingCopy())
-					disAssociateSourcePlusInner(getFullNameFromElement(element));
-				break;
-		}
-	}
-	
-	/**
-	 * Handle the change for a single element, children will be handled separately.
-	 *
-	 */
-	protected void processJavaElementChanged(IJavaProject element, IJavaElementDelta delta) {
-		if (isInClasspath(element)) {
-			if (delta.getKind() == IJavaElementDelta.REMOVED || (delta.getKind() == IJavaElementDelta.CHANGED && (delta.getFlags() & IJavaElementDelta.F_CLOSED) != 0)) {
-				if (element.equals(getAdapterFactory().getJavaProject()))
-					stopSynchronizer();
-				else
-					flushAll(); //another dependent project has changed so flush all to be safe
-				return;
-			} else if (delta.getKind() == IJavaElementDelta.ADDED || isClasspathResourceChange(delta)) {
-				flushAll();
-				return;
-			}
-			processChildren(element, delta);
-		}
-	}
-	/**
-	 * Handle the change for a single element, children will be handled separately.
-	 */
-	protected void processJavaElementChanged(IClassFile element, IJavaElementDelta delta) {
-		int kind = delta.getKind();
-		if (kind == IJavaElementDelta.REMOVED || kind == IJavaElementDelta.ADDED) {
-			// It doesn't matter if totally removed or just moved somewhere else, we will clear out and remove the
-			// adapter because there could be a rename which would be a different class.
-			// Currently the element is already deleted and there is no way to find the types in the unit to remove.
-			// So instead we ask factory to remove all it any that start with it plus for inner classes.
-			disAssociateSourcePlusInner(getFullNameFromElement(element));
-			return; // Since the classfile was removed we don't need to process the children (actually the children list will be empty
-		}
-		IJavaElementDelta[] children = delta.getAffectedChildren();
-		for (int ii = 0; ii < children.length; ii++) {
-			processDelta(children[ii]);
-		}
-	}
-	/**
-	 * Handle the change for a single element, children will be handled separately.
-	 *
-	 */
-	protected void processJavaElementChanged(IPackageFragmentRoot element, IJavaElementDelta delta) {
-		if (flushedAll)
-			return;
-		if (isClassPathChange(delta))
-			flushAll();
-		else
-			super.processJavaElementChanged(element, delta);
-	}
-	
-	/* 
-	 * We will force the flushing of all adaptors for the given package name.
-	 * This is necessary if a type was reflected prior to the package existing or
-	 * if the package is deleted.
-	 * @see org.eclipse.jem.internal.adapters.jdom.JavaModelListener#processJavaElementChanged(org.eclipse.jdt.core.IPackageFragment, org.eclipse.jdt.core.IJavaElementDelta)
-	 */
-	protected void processJavaElementChanged(IPackageFragment element, IJavaElementDelta delta) {
-		switch (delta.getKind()) {
-			case IJavaElementDelta.ADDED : 
-				// Even though added there is possibility that package exists in other root but this
-				// one may now take priority, so we will clear the package anyway.
-				flushPackage(delta.getElement().getElementName(), false);
-				break;
-			case IJavaElementDelta.REMOVED :
-				getAdapterFactory().flushPackage(delta.getElement().getElementName(), false);
-				break;
-			default :
-				super.processJavaElementChanged(element, delta);
-		}
-	}
-
-	/**
-	 * Handle the change for a single element, children will be handled separately.
-	 *
-	 */
-	protected void processJavaElementChanged(IType element, IJavaElementDelta delta) {
-		int kind = delta.getKind();
-		if (kind == IJavaElementDelta.REMOVED || kind == IJavaElementDelta.ADDED) {
-			disAssociateSourcePlusInner(element.getFullyQualifiedName());
-		} else {
-			flush(element);
-			processChildren(element, delta);
-			// Note, if a method element or a field was changed, there may be delta.getAffectedChildren()
-			//       that will have to be processed if we are to update the JavaMethod/JavaField JDOMAdaptor s.	
-		}
-	}
-	/**
-	 * Given that an IType does not exists anymore, assume
-	 * that the type's name is package.filename (without the .java)
-	 * If we are wrong (if, then a rare case),  we will flush.
-	 * Next access will induce a reflection attempt.
-	 * @deprecated This doesn't look like it is ever called. It someone else calls it, please contact development to see if right method to be called.
-	 */
-	protected void processRemoveOrAdd(ICompilationUnit element) {
-		disAssociateSource(getFullNameFromElement(element));
-	}
-	
-	protected String getFullNameFromElement(ICompilationUnit cu) {
-		IType primary = cu.findPrimaryType();
-		if (primary != null)
-			return primary.getFullyQualifiedName();
-		else {
-			String filename = cu.getElementName();
-			// Just strip off extension. There is actually a more complicated test for "java like extenstions" but JDT has that hidden\
-			// so we will just guess and take off the extension.
-			int idx = filename.lastIndexOf('.');
-			if (idx != -1)
-				filename = filename.substring(0, idx);
-			return ((IPackageFragment) cu.getParent()).getElementName()+'.'+filename;
-		}
-	}
-	
-	protected String getFullNameFromElement(IClassFile cf) {
-		try {
-			return cf.getType().getFullyQualifiedName();
-		} catch (JavaModelException e) {
-			JavaPlugin.getDefault().getLogger().log(e, Level.WARNING);
-			String cfName = cf.getElementName();
-			return cfName.substring(0, cfName.length()-(".class".length()));
-		}
-	}
-	
-	protected String getFullNameFromElement(IJavaElement element) {
-		String name = element.getElementName();
-		if (element == null || name.length() <= 5 || !name.substring(name.length() - 5).equals(".java")) { //$NON-NLS-1$
-			// Should not be here, 
-			Logger logger = JavaPlugin.getDefault().getLogger();
-			if (logger.isLoggingLevel(Level.FINE))
-				logger.log("Invalid .java file: " + name, Level.FINE); //$NON-NLS-1$
-			// Make a guess, at worst case, nothing will come out of this.
-			int index = name.lastIndexOf("."); //$NON-NLS-1$
-			if (index >= 0)
-				name = name.substring(0, index) + ".java"; // rename the extension to .java //$NON-NLS-1$
-			else
-				name = name + ".java"; //$NON-NLS-1$
-		}
-		if (element.getParent().getElementName() == null || element.getParent().getElementName().length() == 0)
-			return name.substring(0, name.length() - 5);
-		else
-			return element.getParent().getElementName() + "." + name.substring(0, name.length() - 5); //$NON-NLS-1$
-	}
-	/**
-	 * Stop the synchronizer from listening to any more changes.
-	 */
-	public void stopSynchronizer() {
-		JavaCore.removeElementChangedListener(this);
-	}
-	/**
-	 * @see org.eclipse.jem.internal.adapters.jdom.JavaModelListener#elementChanged(ElementChangedEvent)
-	 */
-	public void elementChanged(ElementChangedEvent event) {
-		try {
-			flushTypes.clear();
-			flushTypePlusInner.clear();
-			notifications.clear();
-			super.elementChanged(event);
-			flushTypes();
-			processNotifications();
-		} finally {
-			flushedAll = false;
-			flushTypes.clear();
-			flushTypePlusInner.clear();
-			notifications.clear();
-		}
-	}
-	/**
-	 * 
-	 */
-	private void flushTypes() {
-		if (!flushTypes.isEmpty()) {
-			IType type = null;
-			Notification not;
-			for (int i = 0; i < flushTypes.size(); i++) {
-				type = (IType) flushTypes.get(i);
-				not = doFlush(type);
-				if (not != null)
-					notifications.add(not);
-			}
-		}
-		if (!flushTypePlusInner.isEmpty()) {
-			ICompilationUnit unit = null;
-			Notification not;
-			for (int i = 0; i < flushTypePlusInner.size(); i++) {
-				unit = (ICompilationUnit) flushTypePlusInner.get(i);
-				not = doFlush(unit);
-				if (not != null)
-					notifications.add(not);
-			}
-		}		
-	}
-	/**
-	 * @param notifications
-	 */
-	private void processNotifications() {
-		Notifier notifier;
-		Notification not;
-		for (int i = 0; i < notifications.size(); i++) {
-			not = (Notification) notifications.get(i);
-			notifier = (Notifier) not.getNotifier();
-			if (notifier != null)
-				try {
-					notifier.eNotify(not);
-				} catch (Exception e) {
-					JavaPlugin.getDefault().getLogger().log(e); //catch exceptions so all notifications are processed
-				} 
-		}
-	}
-	protected void disAssociateSource(String qualifiedName) {
-		Notification not = getAdapterFactory().disAssociateSource(qualifiedName, false);
-		if (not != null)
-			notifications.add(not);
-	}
-	protected void disAssociateSourcePlusInner(String qualifiedName) {
-		Notification not = getAdapterFactory().disAssociateSourcePlusInner(qualifiedName, false);
-		if (not != null)
-			notifications.add(not);
-	}
-	protected void flushAll() {
-		notifications.addAll(getAdapterFactory().flushAllNoNotification());
-		flushedAll = true;
-	}
-	/**
-	 * @see org.eclipse.jem.internal.adapters.jdom.JavaModelListener#processChildren(IJavaElement, IJavaElementDelta)
-	 */
-	protected void processChildren(IJavaElement element, IJavaElementDelta delta) {
-		if (!flushedAll)
-			super.processChildren(element, delta);
-	}
-	/**
-	 * @see org.eclipse.jem.internal.adapters.jdom.JavaModelListener#processDelta(IJavaElementDelta)
-	 */
-	public void processDelta(IJavaElementDelta delta) {
-		if (!flushedAll)
-			super.processDelta(delta);
-	}
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/IJavaProjectInfo.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/IJavaProjectInfo.java
deleted file mode 100644
index 7ca310870..000000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/IJavaProjectInfo.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.plugin;
-
-/**
- * Insert the type's description here.
- * Creation date: (05/07/01 10:06:28 PM)
- * @author: Administrator
- */
-public interface IJavaProjectInfo {
-public String getSourcePath();
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/JavaEMFNature.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/JavaEMFNature.java
deleted file mode 100644
index f66bc9c6b..000000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/JavaEMFNature.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.plugin;
-/*
- * $RCSfile: JavaEMFNature.java,v $ $Revision: 1.17 $ $Date: 2006/09/14 18:31:08 $
- */
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jdt.core.JavaCore;
-
-import org.eclipse.jem.internal.adapters.jdom.JavaJDOMAdapterFactory;
-import org.eclipse.jem.internal.java.adapters.*;
-import org.eclipse.jem.java.adapters.JavaXMIFactory;
-import org.eclipse.jem.util.emf.workbench.EMFWorkbenchContextBase;
-import org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter;
-import org.eclipse.jem.util.emf.workbench.nature.EMFNature;
-import org.eclipse.jem.workbench.utility.IJavaEMFNature;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-
-public class JavaEMFNature extends EMFNature implements IJavaEMFNature {
-/**
- * JavaMOFNatureRuntime constructor comment.
- */
-public JavaEMFNature() {
-	super();
-}
-/**
- * Get a IJavaMOFNatureRuntime that corresponds to the supplied project.
- * @return IJavaMOFNatureRuntime
- * @param project com.ibm.itp.core.api.resources.IProject
- */
-public static JavaEMFNature createRuntime(IProject project) throws CoreException {
-	if(!hasRuntime(project))
-		if (JavaCore.create(project).exists())
-			addNatureToProject(project, IJavaEMFNature.NATURE_ID);
-		else
-			return null;
-
-	return getRuntime(project);
-}
-
-/**
- * Return the nature's ID.
- */
-public java.lang.String getNatureID() {
-	return IJavaEMFNature.NATURE_ID;
-}
-/**
- * Return the ID of the plugin that this nature is contained within.
- */
-protected java.lang.String getPluginID() {
-	return JavaPlugin.getDefault().getBundle().getSymbolicName();
-}
-/**
- * Get a IJavaMOFNatureRuntime that corresponds to the supplied project.
- * First check for registered natures.
- * @return IJavaMOFNatureRuntime
- * @param project com.ibm.itp.core.api.resources.IProject
- */
-public static JavaEMFNature getRuntime(IProject project) {
-	JavaEMFNature nature = null;
-	List runtimes = EMFNature.getRegisteredRuntimes(project);
-	for (int i=0; i<runtimes.size(); i++) {
-		if (runtimes.get(i) instanceof JavaEMFNature)
-			nature = (JavaEMFNature) runtimes.get(i);
-	}
-	if (nature == null)
-		nature = primGetRuntime(project);
-	return nature;
-}
-/**
- * Return whether or not the project has a runtime created on it.
- * Check for registered natures first.
- * @return boolean
- * @param project com.ibm.itp.core.api.resources.IProject
- */
-public static boolean hasRuntime(IProject project) {
-	JavaEMFNature nature = null;
-	List runtimes = EMFNature.getRegisteredRuntimes(project);
-	for (int i=0; i<runtimes.size(); i++) {
-		if (runtimes.get(i) instanceof JavaEMFNature)
-			nature = (JavaEMFNature) runtimes.get(i);
-	}
-	if (nature == null)
-		return primHasRuntime(project);
-	else
-		return true;
-
-}
-/**
- * Get a IJavaMOFNatureRuntime that corresponds to the supplied project.
- * Do not check for other registered types.
- * @return IJavaMOFNatureRuntime
- * @param project com.ibm.itp.core.api.resources.IProject
- */
-public static JavaEMFNature primGetRuntime(IProject project) {
-	try {
-		return (JavaEMFNature) project.getNature(IJavaEMFNature.NATURE_ID);
-	} catch (CoreException e) {
-		return null;
-	}
-}
-/**
- * Return whether or not the project has a runtime created on it.
- * Do not check for registered nature ids.
- * @return boolean
- * @param project com.ibm.itp.core.api.resources.IProject
- */
-public static boolean primHasRuntime(IProject project) {
-	try {
-		return project.hasNature(IJavaEMFNature.NATURE_ID);
-	} catch (CoreException e) {
-		return false;
-	}
-}
-
-/**
- * primary contribute to context
- */
-public void primaryContributeToContext(EMFWorkbenchContextBase aNature) {
-	if (emfContext == aNature) return;
-	emfContext = aNature;
-	ResourceSet set = aNature.getResourceSet();
-	set.getResourceFactoryRegistry().getProtocolToFactoryMap().put(JavaXMIFactory.SCHEME, JavaXMIFactory.INSTANCE);	
-	WorkbenchURIConverter conv = (WorkbenchURIConverter) set.getURIConverter();
-	configureURIConverter(conv);
-	addAdapterFactories(set);	
-}
-
-/**
- * secondary contribute to context
- */
-public void secondaryContributeToContext(EMFWorkbenchContextBase aNature) {
-	primaryContributeToContext(aNature);
-}
-
-/**
- * Remove the project as a container from the converter and add
- * the source folder.
- */
-protected void configureURIConverter(WorkbenchURIConverter conv) {
-	conv.removeInputContainer(getProject());
-	conv.addInputContainer(getEMFRoot());
-}
-
-/**
- * Add Adaptor factories to aContext which is now
- * being used for this nature.
- */
-protected void addAdapterFactories(ResourceSet aSet) {
-	addJavaReflectionAdapterFactories(aSet);
-}
-
-protected void addJavaReflectionAdapterFactories(ResourceSet aSet) {
-	List factories = aSet.getAdapterFactories();
-	// The context may already have a JavaReflection adaptor factory, so remove it
-	// This should maybe be considered a logic error, but we can recover easily
-	if (!factories.isEmpty()) {
-		AdapterFactory factory = EcoreUtil.getAdapterFactory(factories, ReadAdaptor.TYPE_KEY);
-		if (factory != null)
-			factories.remove(factory);
-	}
-
-	factories.add(adapterFactory);
-}
-
-private JavaJDOMAdapterFactory adapterFactory;
-
-/* (non-Javadoc)
- * @see org.eclipse.jem.util.emf.workbench.nature.EMFNature#setProject(org.eclipse.core.resources.IProject)
- */
-public void setProject(IProject newProject) {
-	super.setProject(newProject);
-	adapterFactory = new JavaJDOMAdapterFactory(JemProjectUtilities.getJavaProject(project));
-}
-
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/JavaPlugin.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/JavaPlugin.java
deleted file mode 100644
index 4a6b0bf83..000000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/JavaPlugin.java
+++ /dev/null
@@ -1,67 +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.plugin;
-/*
- * $RCSfile: JavaPlugin.java,v $ $Revision: 1.13 $ $Date: 2006/05/17 20:13:58 $
- */
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-import org.eclipse.jem.internal.adapters.jdom.JavaJDOMAdapterFactory;
-import org.eclipse.jem.internal.java.adapters.jdk.JavaJDKAdapterFactory;
-import org.eclipse.jem.java.util.JavaContext;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.util.logger.proxyrender.EclipseLogger;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-/**
- * This is a top-level class of the java plugin tool.
- * 
- * @see AbstractUIPlugin for additional information on UI plugins
- */
-
-public class JavaPlugin extends Plugin {
-
-	private static JavaPlugin INSTANCE;
-	private Logger logger;
-
-	/**
-	 * Create the Java plugin and cache its default instance
-	 */
-	public JavaPlugin() {
-		INSTANCE = this;
-	}
-
-	public Logger getLogger() {
-		if (logger == null)
-			logger = EclipseLogger.getEclipseLogger(this);
-		return logger;
-	}
-
-	/**
-	 * Get the plugin singleton.
-	 */
-	static public JavaPlugin getDefault() {
-		return INSTANCE;
-	}
-
-		/* (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		INSTANCE = this;
-		JavaContext.setReflectionAdapterFactoryClass(JavaJDOMAdapterFactory.class);
-		JEMUtilPlugin.getPluginResourceSet().getAdapterFactories().add(new JavaJDKAdapterFactory());		
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/JavaProjectInfo.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/JavaProjectInfo.java
deleted file mode 100644
index d6f3c4f7a..000000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/JavaProjectInfo.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.jem.internal.plugin;
-/*
- *  $RCSfile: JavaProjectInfo.java,v $
- *  $Revision: 1.3 $  $Date: 2005/08/24 21:13:53 $ 
- */
-/**
- * Insert the type's description here.
- * Creation date: (05/07/01 10:09:26 PM)
- * @author: Administrator
- */
-public class JavaProjectInfo implements IJavaProjectInfo {
-	
-	public final static String DEFAULT_JAVA_OUTPUT_PATH = "bin";//$NON-NLS-1$
-	public final static String DEFAULT_SOURCE_PATH = "source";//$NON-NLS-1$
-	protected String sourcePath;
-/**
- * JavaProjectInfo constructor comment.
- */
-public JavaProjectInfo() {
-	super();
-}
-/**
- * Subclasses should override as necessary
- */
-protected String getDefaultSourcePath() {
-	return DEFAULT_SOURCE_PATH;
-}
-/**
- * Get the class path for the reciever. By default ask the template
- * @return java.lang.String
- */
-public String getSourcePath() {
-	if (sourcePath == null)
-		sourcePath = getDefaultSourcePath();
-	return sourcePath;
-}
-public void setSourcePath(String path) {
-	sourcePath = path;
-}
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/ASTBoundResolver.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/ASTBoundResolver.java
deleted file mode 100644
index 37afec733..000000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/ASTBoundResolver.java
+++ /dev/null
@@ -1,117 +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: ASTBoundResolver.java,v $
- *  $Revision: 1.9 $  $Date: 2005/08/24 21:13:53 $ 
- */
-package org.eclipse.jem.workbench.utility;
-
-import java.text.MessageFormat;
-
-import org.eclipse.jdt.core.dom.*;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.workbench.utility.ParseTreeCreationFromAST.InvalidExpressionException;
- 
-/**
- * This works on resolved AST nodes. If the nodes had not been resolved, this will return noting.
- * 
- * @since 1.0.0
- */
-public class ASTBoundResolver extends ParseTreeCreationFromAST.Resolver {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.workbench.utility.ParseTreeCreationFromAST.IResolver#resolveName(org.eclipse.jdt.core.dom.Name)
-	 */
-	public PTExpression resolveName(Name name) {
-		IBinding binding = name.resolveBinding();
-		if (binding == null)
-			return null;
-		
-		switch (binding.getKind()) {
-			case IBinding.TYPE:
-				String typename = getTypeName((ITypeBinding) binding);
-				PTName ptname = InstantiationFactory.eINSTANCE.createPTName();
-				ptname.setName(typename);
-				return ptname;
-			case IBinding.VARIABLE:
-				IVariableBinding variableBinding = (IVariableBinding) binding;
-				if (variableBinding.isField()) {
-					if (Modifier.isStatic(variableBinding.getModifiers())) {
-						PTFieldAccess fa = InstantiationFactory.eINSTANCE.createPTFieldAccess();
-						// If just a simple name, then it is like this.field, so no receiver. Not sure how to handle this yet.
-						if (name.isQualifiedName()) {
-							// There are parts before this one. Get them as an expression (either a name, or another field access)
-							fa.setReceiver(resolveName(((QualifiedName) name).getQualifier()));
-						}
-						fa.setField(variableBinding.getName());
-						return fa;
-					} else {
-						throwInvalidExpressionException(MessageFormat.format(WorkbenchUtilityMessages.ASTBoundResolver_CannotHandleLocalField_EXC_, new Object[]{variableBinding.getName()})); 
-//						push(new PushFieldVariable(variableId, getTypeSignature(declaringTypeBinding), fCounter));
-//						push(new PushThis(getEnclosingLevel(node, declaringTypeBinding)));
-//						storeInstruction();
-					}
-				} else {
-					throwInvalidExpressionException(MessageFormat.format(WorkbenchUtilityMessages.ASTBoundResolver_CannotHandleLocalVariable_EXC_, new Object[]{variableBinding.getName()})); 
-//					push(new PushLocalVariable(variableId));
-				}				
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.workbench.utility.IResolver#resolveType(org.eclipse.jdt.core.dom.Type)
-	 */
-	public String resolveType(Type type) {
-		ITypeBinding binding = type.resolveBinding();
-		return (binding != null) ? getTypeName(binding) : null; 
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.workbench.utility.ParseTreeCreationFromAST.Resolver#resolveType(org.eclipse.jdt.core.dom.Name)
-	 */
-	public String resolveType(Name name) throws InvalidExpressionException {
-		ITypeBinding binding = name.resolveTypeBinding();
-		return (binding != null) ? getTypeName(binding) : null; 
-	}
-	
-	protected String getTypeName(ITypeBinding typeBinding) {
-		StringBuffer name;
-		if (typeBinding.isArray()) {
-			name= new StringBuffer(getTypeName(typeBinding.getElementType()));
-			int dimensions= typeBinding.getDimensions();
-			for (int i= 0; i < dimensions; i++) {
-				name.append("[]"); //$NON-NLS-1$
-			}
-			return name.toString();
-		}
-		name= new StringBuffer(typeBinding.getName());
-		IPackageBinding packageBinding= typeBinding.getPackage();
-		typeBinding= typeBinding.getDeclaringClass();
-		while(typeBinding != null) {
-			name.insert(0, '$').insert(0, typeBinding.getName());
-			typeBinding= typeBinding.getDeclaringClass();
-		}
-		if (packageBinding != null && !packageBinding.isUnnamed()) {
-			name.insert(0, '.').insert(0, packageBinding.getName());
-		}
-		return name.toString();
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.workbench.utility.ParseTreeCreationFromAST.Resolver#resolveThis()
-	 */
-	public PTExpression resolveThis() throws InvalidExpressionException {
-		return InstantiationFactory.eINSTANCE.createPTThisLiteral();
-	}
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/IJavaEMFNature.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/IJavaEMFNature.java
deleted file mode 100644
index 542783381..000000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/IJavaEMFNature.java
+++ /dev/null
@@ -1,26 +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: IJavaEMFNature.java,v $
- *  $Revision: 1.1 $  $Date: 2005/09/14 23:30:27 $ 
- */
-package org.eclipse.jem.workbench.utility;
- 
-/**
- * Interface for Java EMF Nature constants.
- * 
- * @since 1.2.0
- */
-public interface IJavaEMFNature {
-
-	public static final String NATURE_ID = "org.eclipse.jem.workbench.JavaEMFNature"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/JavaModelListener.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/JavaModelListener.java
deleted file mode 100644
index 2e7dbc211..000000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/JavaModelListener.java
+++ /dev/null
@@ -1,426 +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.workbench.utility;
-
-/*
- * $RCSfile: JavaModelListener.java,v $ $Revision: 1.6 $ $Date: 2006/09/14 18:31:08 $
- */
-
-import java.util.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.*;
-
-import org.eclipse.jem.internal.core.JEMPlugin;
-
-/**
- * An element change listener to listen for Java Model changes. It breaks the notification up into individual method calls to make it easier to walk
- * the notification tree.
- * 
- * @since 1.2.0
- */
-public abstract class JavaModelListener implements IElementChangedListener {
-
-	/**
-	 * Construct with listening only for {@link ElementChangedEvent#POST_CHANGE} events.
-	 * 
-	 * 
-	 * @since 1.2.0
-	 */
-	public JavaModelListener() {
-		this(ElementChangedEvent.POST_CHANGE);
-	}
-
-	/**
-	 * Construct with supplying the type of events to listen for.
-	 * 
-	 * @param eventsToListen
-	 *            or'd together event listening types. See {@link ElementChangedEvent} for the types.
-	 * 
-	 * @since 1.2.0
-	 */
-	public JavaModelListener(int eventsToListen) {
-		JavaCore.addElementChangedListener(this, eventsToListen);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jdt.core.IElementChangedListener#elementChanged(org.eclipse.jdt.core.ElementChangedEvent)
-	 */
-	public void elementChanged(ElementChangedEvent event) {
-		processDelta((IJavaElementDelta) event.getSource());
-	}
-
-	/**
-	 * Generally dispatch the children of the delta. Normally this method should not be overridden.
-	 * 
-	 * @param element
-	 * @param delta
-	 * 
-	 * @since 1.2.0
-	 */
-	protected void processChildren(IJavaElement element, IJavaElementDelta delta) {
-		IJavaElementDelta[] children = delta.getAffectedChildren();
-		for (int i = 0; i < children.length; i++) {
-			processDelta(children[i]);
-		}
-	}
-
-	/**
-	 * Source content has changed. The default is to do nothing. Subclasses may override to perform own functions.
-	 * 
-	 * @param delta
-	 * 
-	 * @since 1.2.0
-	 */
-	protected void processContentChanged(IJavaElementDelta delta) {
-	}
-
-	/**
-	 * Dispatch the java element delta. This method should normally not be overridden. One
-	 * usage would be to add delta types that are to be processed and dispatched by the
-	 * subclasses. For example also dispatch on {@link IJavaElement#IMPORT_CONTAINER}. Subclasses
-	 * should call <code>super.processDelta(IJavaElementDelta)</code> if it is not one they
-	 * are interested in.
-	 * 
-	 * @param delta
-	 * 
-	 * @since 1.2.0
-	 */
-	public void processDelta(IJavaElementDelta delta) {
-		IJavaElement element = delta.getElement();
-
-		switch (element.getElementType()) {
-			case IJavaElement.JAVA_MODEL:
-				processJavaElementChanged((IJavaModel) element, delta);
-				break;
-			case IJavaElement.JAVA_PROJECT:
-				processJavaElementChanged((IJavaProject) element, delta);
-				break;
-			case IJavaElement.PACKAGE_FRAGMENT_ROOT:
-				processJavaElementChanged((IPackageFragmentRoot) element, delta);
-				break;
-			case IJavaElement.PACKAGE_FRAGMENT:
-				processJavaElementChanged((IPackageFragment) element, delta);
-				break;
-			case IJavaElement.COMPILATION_UNIT:
-				processJavaElementChanged((ICompilationUnit) element, delta);
-				processContentChanged(delta);
-				break;
-			case IJavaElement.CLASS_FILE:
-				processJavaElementChanged((IClassFile) element, delta);
-				break;
-			case IJavaElement.TYPE:
-				processJavaElementChanged((IType) element, delta);
-				break;
-			// Note: if we are to update the Method/Field adapters, we should process the
-			// IJavaElement.METHOD and IJavaElement.FIELD
-		}
-	}
-
-	/**
-	 * Process the classfile changed event. The default is to do nothing. It will not walk any children of the delta either. Subclasses may override
-	 * to perform their own functions.
-	 * 
-	 * @param element
-	 * @param delta
-	 * 
-	 * @since 1.2.0
-	 */
-	protected void processJavaElementChanged(IClassFile element, IJavaElementDelta delta) {
-	}
-
-	/**
-	 * Process the compilation unit changed event. The default is to process the children of the delta. Subclasses may override to perform their own
-	 * functions. If they wish to walk the children they should then also call
-	 * <code>super.processJavaElementChanged(ICompilationUnit, IJavaElementDelta)</code>.
-	 * 
-	 * @param element
-	 * @param delta
-	 * 
-	 * @since 1.2.0
-	 */
-	protected void processJavaElementChanged(ICompilationUnit element, IJavaElementDelta delta) {
-		processChildren(element, delta);
-	}
-
-	/**
-	 * Process the java model changed event. The default is to process the children of the delta. Subclasses may override to perform their own
-	 * functions. If they wish to walk the children they should then also call
-	 * <code>super.processJavaElementChanged(IJavaModel, IJavaElementDelta)</code>.
-	 * 
-	 * @param element
-	 * @param delta
-	 * 
-	 * @since 1.2.0
-	 */
-	protected void processJavaElementChanged(IJavaModel element, IJavaElementDelta delta) {
-		processChildren(element, delta);
-	}
-
-	/**
-	 * Process the java project changed event. The default is to process the children of the delta. Subclasses may override to perform their own
-	 * functions. If they wish to walk the children they should then also call
-	 * <code>super.processJavaElementChanged(IJavaProject, IJavaElementDelta)</code>.
-	 * 
-	 * @param element
-	 * @param delta
-	 * 
-	 * @since 1.2.0
-	 */
-	protected void processJavaElementChanged(IJavaProject element, IJavaElementDelta delta) {
-		processChildren(element, delta);
-	}
-
-	/**
-	 * Process the package fragment changed event. The default is to process the children of the delta. Subclasses may override to perform their own
-	 * functions. If they wish to walk the children they should then also call
-	 * <code>super.processJavaElementChanged(IPackageFragment, IJavaElementDelta)</code>.
-	 * 
-	 * @param element
-	 * @param delta
-	 * 
-	 * @since 1.2.0
-	 */
-	protected void processJavaElementChanged(IPackageFragment element, IJavaElementDelta delta) {
-		processChildren(element, delta);
-	}
-
-	/**
-	 * Process the package fragment root changed event. The default is to process the children of the delta. Subclasses may override to perform their
-	 * own functions. If they wish to walk the children they should then also call
-	 * <code>super.processJavaElementChanged(IPackageFragmentRoot, IJavaElementDelta)</code>.
-	 * 
-	 * @param element
-	 * @param delta
-	 * 
-	 * @since 1.2.0
-	 */
-	protected void processJavaElementChanged(IPackageFragmentRoot element, IJavaElementDelta delta) {
-		processChildren(element, delta);
-	}
-
-	/**
-	 * Process the IType changed event. The default is to do nothing. It will not walk any children of the delta either. Subclasses may override to
-	 * perform their own functions.
-	 * 
-	 * @param element
-	 * @param delta
-	 * 
-	 * @since 1.2.0
-	 */
-	protected void processJavaElementChanged(IType element, IJavaElementDelta delta) {
-	}
-
-	/**
-	 * Answers whether this element delta is a classpath change. I.e. something added/removed/moved around for the classpath. This should only be
-	 * called for a delta that is for an {@link IPackageFragmentRoot}. Should be called from an override of
-	 * {@link #processJavaElementChanged(IPackageFragmentRoot, IJavaElementDelta)}
-	 * 
-	 * @param delta
-	 * @return <code>true</code> if it is classpath change or <code>false</code> if not.
-	 * 
-	 * @since 1.2.0
-	 */
-	protected boolean isClassPathChange(IJavaElementDelta delta) {
-		int flags = delta.getFlags();
-		return (delta.getKind() == IJavaElementDelta.CHANGED && ((flags & IJavaElementDelta.F_ADDED_TO_CLASSPATH) != 0)
-				|| ((flags & IJavaElementDelta.F_REMOVED_FROM_CLASSPATH) != 0) || ((flags & IJavaElementDelta.F_REORDER) != 0));
-	}
-
-	/**
-	 * Answer whether the change is this is a raw classpath change, or if a file that is in the root of the project was changed that also can mean a
-	 * raw classpath change. This must only be called for a delta that is for an {@link IJavaProject}.
-	 * <p>
-	 * See {@link IJavaElementDelta.#F_CLASSPATH_CHANGED} and {@link #isAlsoClasspathChange(IPath)} for details.
-	 * 
-	 * @param delta
-	 * @return
-	 * 
-	 * @since 1.2.0
-	 */
-	protected boolean isClasspathResourceChange(IJavaElementDelta delta) {
-		if ((delta.getFlags() & IJavaElementDelta.F_CLASSPATH_CHANGED) != 0)
-			return true;
-		IResourceDelta[] resources = delta.getResourceDeltas();
-		if (resources == null)
-			return false;
-		IPath path = null;
-		for (int i = 0; i < resources.length; i++) {
-			if (resources[i].getKind() == IResourceDelta.CHANGED) {
-				path = resources[i].getProjectRelativePath();
-				if (isAlsoClasspathChange(path))
-					return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Answers whether the file specified by the path is one that when changed can result in a classpath change. This is called from
-	 * {@link #isClasspathResourceChange(IJavaElementDelta)}. The file must be in the root of the project. The default is <code>false</code>.
-	 * Subclasses may override.
-	 * 
-	 * @param path
-	 * @return <code>true</code> if this file being changed would result in a classpath change, <code>false</code> if not.
-	 * 
-	 * @since 1.2.0
-	 */
-	protected boolean isAlsoClasspathChange(IPath path) {
-		return false;
-	}
-
-	/**
-	 * Answers whether the given java project is in the classpath (including recursive). This currently will not walk through containers (such as the
-	 * PDE container). Only through the direct and recursive project references. The java project is determined by subclasses, see
-	 * {@link #getJavaProject()}.
-	 * 
-	 * @param javaProject
-	 * @return <code>true</code> if project is in classpath or <code>false</code> if not.
-	 * 
-	 * @since 1.2.0
-	 */
-	protected boolean isInClasspath(IJavaProject javaProject) {
-		IJavaProject listenerJavaProject = getJavaProject();
-		if (javaProject.equals(listenerJavaProject))
-			return true;
-		return isInClasspath(javaProject, listenerJavaProject, true, new HashSet());
-	}
-
-	/**
-	 * The java project for this listener. Subclasses must provide a java project.
-	 * 
-	 * @return the java project. <code>null</code> is not valid.
-	 * 
-	 * @since 1.2.0
-	 */
-	protected abstract IJavaProject getJavaProject();
-
-	/*
-	 * test to see if the testProject is in the classpath (including from any referenced projects) of the target project. Keep track of those already
-	 * visited so as not to visit again. Too late to make private. But it should not be overridden.
-	 */
-	protected boolean isInClasspath(IJavaProject testProject, IJavaProject targetProject, boolean isFirstLevel, Set visited) {
-		if (visited.contains(targetProject))
-			return false;
-		visited.add(targetProject);
-		IClasspathEntry[] entries = null;
-		try {
-			entries = targetProject.getRawClasspath();
-		} catch (JavaModelException e) {
-			return false;
-		}
-		List projects = null;
-		for (int i = 0; i < entries.length; i++) {
-			IClasspathEntry entry;
-			entry = entries[i];
-			switch (entry.getEntryKind()) {
-				case IClasspathEntry.CPE_PROJECT:
-					IJavaProject entryProject = getVisibleJavaProject(entry, isFirstLevel);
-					if (entryProject != null) {
-						if (entryProject.equals(testProject)) {
-							return true;
-						} else {
-							if (projects == null) {
-								projects = new ArrayList();
-							}
-							projects.add(entryProject);
-						}
-					}
-					break;
-				//A container may contain references to projects.
-				case IClasspathEntry.CPE_CONTAINER :
-					IClasspathContainer container = null;
-					try {
-						container = JavaCore.getClasspathContainer(entry.getPath(), targetProject);
-					} catch (JavaModelException e) {
-						JEMPlugin.getPlugin().getLogger().logError(e);
-					}
-					if (container == null || container.getKind() != IClasspathContainer.K_APPLICATION)
-						break;
-					IClasspathEntry[] containerEntries = container.getClasspathEntries();
-					for (int j = 0; j < containerEntries.length; j++) {
-						if (containerEntries[j].getEntryKind() == IClasspathEntry.CPE_PROJECT) {
-							IJavaProject conEntryProject = getVisibleJavaProject(containerEntries[j], isFirstLevel);
-							if (conEntryProject != null) {
-								if (conEntryProject.equals(testProject)) {
-									return true;
-								} else {
-									if (projects == null) {
-										projects = new ArrayList();
-									}
-									projects.add(conEntryProject);
-								}
-							}
-						}
-					}
-					break;
-			}
-		}
-		return isInClasspath(testProject, projects, false, visited);
-	}
-	
-	/*
-	 * This method is used to return an IJavaProject that is resolved from the entry
-	 * if it is currently visible to downstream projects.
-	 */
-	private IJavaProject getVisibleJavaProject(IClasspathEntry entry, boolean isFirstLevel) {
-		if (isFirstLevel || entry.isExported()) {
-			IClasspathEntry resEntry = JavaCore.getResolvedClasspathEntry(entry);
-			return getJavaProject(resEntry);
-		}
-		return null;
-	}
-
-	/*
-	 * See if the testProject is in the classpath of any of the list of projects or in any project that an entry in the list may of visited. Too late
-	 * to make private. But it should not be overridden.
-	 */
-	protected boolean isInClasspath(IJavaProject testProject, List someJavaProjects, boolean isFirstLevel, Set visited) {
-		if (someJavaProjects == null)
-			return false;
-		int size = someJavaProjects.size();
-		IJavaProject javaProj = null;
-		for (int i = 0; i < size; i++) {
-			javaProj = (IJavaProject) someJavaProjects.get(i);
-			return isInClasspath(testProject, javaProj, isFirstLevel, visited);
-		}
-		return false;
-	}
-
-	/**
-	 * Get the java project that classpath entry is for. This should only be called on classpath entries of type {@link IClasspathEntry#CPE_PROJECT}
-	 * 
-	 * @param entry
-	 *            classpath entry of type {@link IClasspathEntry#CPE_PROJECT}.
-	 * @return the java project for this entry. The project might not actually exist. That is not verified.
-	 * 
-	 * @since 1.2.0
-	 */
-	protected IJavaProject getJavaProject(IClasspathEntry entry) {
-		IProject proj = getWorkspaceRoot().getProject(entry.getPath().segment(0));
-		if (proj != null)
-			return JavaCore.create(proj);
-		return null;
-	}
-
-	/**
-	 * Get the workspace root. A utility method.
-	 * @return the workspace root.
-	 * 
-	 * @since 1.2.0
-	 */
-	protected IWorkspaceRoot getWorkspaceRoot() {
-		return ResourcesPlugin.getWorkspace().getRoot();
-	}
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/JemProjectUtilities.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/JemProjectUtilities.java
deleted file mode 100644
index df48418ab..000000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/JemProjectUtilities.java
+++ /dev/null
@@ -1,754 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.workbench.utility;
-/*
- * $RCSfile: JemProjectUtilities.java,v $ $Revision: 1.10.6.1 $ $Date: 2009/10/30 01:49:31 $
- */
-
-import java.net.URL;
-import java.util.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.core.*;
-
-import org.eclipse.jem.internal.plugin.JavaEMFNature;
-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.WorkbenchResourceHelperBase;
-import org.eclipse.jem.util.emf.workbench.nature.EMFNature;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-/**
- * Project Utilities for JEM and Java.
- * 
- * @since 1.1.0
- */
-public class JemProjectUtilities extends ProjectUtilities {
-	
-	private JemProjectUtilities(){
-	}
-	
-	/**
-	 * The nature id for JEM Nature.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String JEM_EMF_NatureID = IJavaEMFNature.NATURE_ID;
-	
-	/**
-	 * Get the EMF nature for JEM for the project. 
-	 * @param project
-	 * @param addNature <code>true</code> if add the nature to the project if not set. <code>false</code> if don't add nature if not already on project.
-	 * @return the EMFNature or <code>null</code> if not found and addNature was <code>false</code> or it was not a java project.
-	 * @throws CoreException 
-	 * 
-	 * @since 1.1.0
-	 */
-	public static EMFNature getJEM_EMF_Nature(IProject project, boolean addNature) throws CoreException {
-		return addNature ? JavaEMFNature.createRuntime(project) : JavaEMFNature.getRuntime(project);
-	}
-
-	/**
-	 * Get the JavaClass from an IFile.
-	 * @param aFile
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public static JavaClass getJavaClass(IFile aFile) {
-		if (aFile == null)
-			return null;
-		IProject project = aFile.getProject();
-		List folders = getSourceContainers(project);
-		folders.addAll(getLibraryContainers(project));
-		IContainer folder = null;
-		IPath folderPath, filePath, javaPath;
-		filePath = aFile.getProjectRelativePath();
-		if (folders != null) {
-			for (int i = 0; i < folders.size(); i++) {
-				folder = (IContainer) folders.get(i);
-				folderPath = folder.getProjectRelativePath();
-				int segments = filePath.matchingFirstSegments(folderPath);
-				if (segments > 0) {
-					javaPath = filePath.removeFirstSegments(segments);
-					javaPath = javaPath.removeFileExtension();
-					String qualifiedName = javaPath.toString().replace('/', '.');
-					return (JavaClass) JavaRefFactory.eINSTANCE.reflectType(qualifiedName, WorkbenchResourceHelperBase.getResourceSet(project));
-				}
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Get source containers for the project.
-	 * 
-	 * @param p
-	 *            project
-	 * @return list of source containers.
-	 * 
-	 * @since 1.0.0
-	 */
-	public static List getSourceContainers(IProject p) {
-		try {
-			List sourceContainers = new ArrayList();
-			List sourcePaths = getSourcePaths(p);
-			if (sourcePaths != null && !sourcePaths.isEmpty()) {
-				for (int i = 0; i < sourcePaths.size(); i++) {
-					IPath path = (IPath) sourcePaths.get(i);
-					if (path.isEmpty())
-						sourceContainers.add(p);
-					else
-						sourceContainers.add(p.getFolder(path));
-				}
-			}
-			return sourceContainers;
-		} catch (IllegalArgumentException ex) {
-			return Collections.EMPTY_LIST;
-		}
-	}
-	
-	protected static List getSourcePaths(IProject p) {
-		IJavaProject javaProj = getJavaProject(p);
-		if (javaProj == null)
-			return null;
-		IClasspathEntry[] cp = null;
-		try {
-			cp = javaProj.getRawClasspath();
-		} catch (JavaModelException ex) {
-			JEMUtilPlugin.getLogger().logError(ex);
-			return null;
-		}
-		List sourcePaths = new ArrayList();
-		for (int i = 0; i < cp.length; i++) {
-			if (cp[i].getEntryKind() == IClasspathEntry.CPE_SOURCE) {
-				sourcePaths.add(cp[i].getPath().removeFirstSegments(1));
-			}
-		}
-		return sourcePaths;
-	}
-	
-	/**
-	 * Return list of IContainers that are Libraries in the classpath.
-	 * 
-	 * @param p
-	 *            project
-	 * @return list of library IContainers.
-	 * 
-	 * @since 1.0.0
-	 */
-	public static List getLibraryContainers(IProject p) {
-		try {
-			List libraryContainers = new ArrayList();
-			List libraryPaths = getlibraryPaths(p);
-			if (libraryPaths != null && !libraryPaths.isEmpty()) {
-				for (int i = 0; i < libraryPaths.size(); i++) {
-					IPath path = (IPath) libraryPaths.get(i);
-					if (path.isEmpty())
-						libraryContainers.add(p);
-					else
-						libraryContainers.add(p.getFolder(path));
-				}
-			}
-			return libraryContainers;
-		} catch (IllegalArgumentException ex) {
-			return Collections.EMPTY_LIST;
-		}
-	}
-	
-	
-	protected static List getlibraryPaths(IProject p) {
-		IJavaProject javaProj = getJavaProject(p);
-		if (javaProj == null)
-			return null;
-		IClasspathEntry[] cp = null;
-		try {
-			cp = javaProj.getRawClasspath();
-		} catch (JavaModelException ex) {
-			JEMUtilPlugin.getLogger().logError(ex);
-			return null;
-		}
-		List libraryPaths = new ArrayList();
-		for (int i = 0; i < cp.length; i++) {
-			if (cp[i].getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
-				libraryPaths.add(cp[i].getPath().removeFirstSegments(1));
-			}
-		}
-		return libraryPaths;
-	}
-	
-	/**
-	 * Get the java project nature for the given project.
-	 * 
-	 * @param p
-	 *            project
-	 * @return the java project nature for the project or <code>null</code> if not a java project.
-	 * 
-	 * @since 1.0.0
-	 */
-	public static IJavaProject getJavaProject(IProject p) {
-		try {
-			return (IJavaProject) p.getNature(JavaCore.NATURE_ID);
-		} catch (CoreException ignore) {
-			return null;
-		}
-	}
-
-	/**
-	 * Touch classpath. It simply takes the classpath and sets it back in.
-	 * 
-	 * @param javaProject
-	 * @throws JavaModelException
-	 * 
-	 * @since 1.0.0
-	 */
-	public static void updateClasspath(IJavaProject javaProject) throws JavaModelException {
-		if (javaProject != null)
-			javaProject.setRawClasspath(javaProject.getRawClasspath(), new NullProgressMonitor());
-	}
-
-	/**
-	 * Return the location of the binary output files for the JavaProject.
-	 * 
-	 * @param p
-	 *            project
-	 * @return path to binary output folder or <code>null</code> if not java project or other problem.
-	 * 
-	 * @since 1.0.0
-	 */
-	public static IPath getJavaProjectOutputLocation(IProject p) {
-		try {
-			IJavaProject javaProj = getJavaProject(p);
-			if (javaProj == null)
-				return null;
-			if (!javaProj.isOpen())
-				javaProj.open(null);
-			return javaProj.getOutputLocation();
-		} catch (JavaModelException e) {
-			return null;
-		}
-	}
-
-	/**
-	 * Get the project's binary output container.
-	 * 
-	 * @param p
-	 *            project
-	 * @return project's output container or <code>null</code> if not java project or some other error.
-	 * 
-	 * @since 1.0.0
-	 */
-	public static IContainer getJavaProjectOutputContainer(IProject p) {
-		IPath path = getJavaProjectOutputLocation(p);
-		if (path == null)
-			return null;
-		if (path.segmentCount() == 1)
-			return p;
-		return p.getFolder(path.removeFirstSegments(1));
-	}
-
-	/**
-	 * Get the binary output absolute (local file system) path.
-	 * 
-	 * @param p
-	 *            project
-	 * @return project's output path or <code>null</code> if not java project or some other error.
-	 * 
-	 * @since 1.0.0
-	 */
-	public static IPath getJavaProjectOutputAbsoluteLocation(IProject p) {
-		IContainer container = getJavaProjectOutputContainer(p);
-		if (container != null)
-			return container.getLocation();
-		return null;
-	}
-
-	/**
-	 * Get the JDT JavaModel.
-	 * 
-	 * @return JDT's JavaModel
-	 * 
-	 * @since 1.0.0
-	 */
-	public static IJavaModel getJavaModel() {
-		return JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());
-	}
-
-	/**
-	 * Get all source package fragment roots.
-	 * 
-	 * @param javaProj
-	 * @return source package fragment roots
-	 * @throws JavaModelException
-	 * 
-	 * @since 1.0.0
-	 */
-	public static List getSourcePackageFragmentRoots(IJavaProject javaProj) throws JavaModelException {
-		List result = new ArrayList();
-		IPackageFragmentRoot[] roots = javaProj.getPackageFragmentRoots();
-		for (int i = 0; i < roots.length; i++) {
-			IPackageFragmentRoot root = roots[i];
-			if (root.getKind() == IPackageFragmentRoot.K_SOURCE)
-				result.add(result);
-		}
-		return result;
-	}
-
-	/**
-	 * Remove the resource from the classpath
-	 * 
-	 * @param p
-	 *            project
-	 * @param res
-	 *            resource
-	 * @throws JavaModelException
-	 * 
-	 * @since 1.0.0
-	 */
-	public static void removeFromJavaClassPath(IProject p, IResource res) throws JavaModelException {
-		IClasspathEntry entry = JavaCore.newLibraryEntry(res.getFullPath(), null, null);
-		removeFromJavaClassPath(p, entry);
-	}
-
-	/**
-	 * Remove the path from the classpath
-	 * 
-	 * @param p
-	 *            project
-	 * @param path
-	 *            path to remove
-	 * @throws JavaModelException
-	 * 
-	 * @since 1.0.0
-	 */
-	public static void removeFromJavaClassPath(IProject p, IPath path) throws JavaModelException {
-		org.eclipse.core.resources.IFile f = p.getFile(path);
-		removeFromJavaClassPath(p, f);
-	}
-
-	/**
-	 * Remove the classpath entry from the project's classpath.
-	 * 
-	 * @param p
-	 * @param entry
-	 * @throws JavaModelException
-	 * 
-	 * @since 1.0.0
-	 */
-	public static void removeFromJavaClassPath(IProject p, IClasspathEntry entry) throws JavaModelException {
-		IJavaProject javaProject = null;
-		try {
-			javaProject = (IJavaProject) p.getNature(JavaCore.NATURE_ID);
-		} catch (CoreException ignore) {
-		}
-		if (javaProject != null) {
-			IClasspathEntry[] classpath = javaProject.getRawClasspath();
-			javaProject.setRawClasspath(primRemoveFromJavaClassPath(classpath, entry), new NullProgressMonitor());
-		}
-	}
-
-	/**
-	 * Remove the list of entries from the classpath of the project.
-	 * 
-	 * @param p
-	 *            project
-	 * @param entries
-	 *            list of IClassPathEntry's
-	 * @throws JavaModelException
-	 * 
-	 * @since 1.0.0
-	 */
-	public static void removeFromJavaClassPath(IProject p, List entries) throws JavaModelException {
-		IJavaProject javaProject = null;
-		try {
-			javaProject = (IJavaProject) p.getNature(JavaCore.NATURE_ID);
-		} catch (CoreException ignore) {
-		}
-		if (javaProject != null) {
-			IClasspathEntry[] classpath = javaProject.getRawClasspath();
-			javaProject.setRawClasspath(primRemoveFromJavaClassPath(classpath, entries), new NullProgressMonitor());
-		}
-	}
-
-	protected static IClasspathEntry[] primRemoveFromJavaClassPath(IClasspathEntry[] classpath, IClasspathEntry entry) throws JavaModelException {
-		List result = new ArrayList();
-		boolean didRemove = false;
-		for (int i = 0; i < classpath.length; i++) {
-			IClasspathEntry cpEntry = classpath[i];
-			if (!entry.getPath().equals(classpath[i].getPath()))
-				result.add(cpEntry);
-			else
-				didRemove = true;
-		}
-		if (!didRemove)
-			return classpath;
-		return (IClasspathEntry[]) result.toArray(new IClasspathEntry[result.size()]);
-	}
-
-	protected static IClasspathEntry[] primRemoveFromJavaClassPath(IClasspathEntry[] classpath, List entries) throws JavaModelException {
-		List arrayList = Arrays.asList(classpath);
-		List removeable = new ArrayList(arrayList);
-		IClasspathEntry entry;
-		boolean didRemove = false;
-		int size = entries.size();
-		for (int i = 0; i < size; i++) {
-			entry = (IClasspathEntry) entries.get(i);
-			for (int j = 0; j < classpath.length; j++) {
-				IClasspathEntry cpEntry = classpath[j];
-				if (entry.getPath().equals(classpath[j].getPath())) {
-					if (removeable.remove(cpEntry))
-						didRemove = true;
-				}
-			}
-		}
-		if (!didRemove)
-			return classpath;
-		return (IClasspathEntry[]) removeable.toArray(new IClasspathEntry[removeable.size()]);
-	}
-
-	/**
-	 * Get the classpath as an array or URL's.
-	 * 
-	 * @param javaProject
-	 * @return array of URL's or <code>null</code> if javaProject was <code>null</code>.
-	 * 
-	 * @since 1.0.0
-	 */
-	public static URL[] getClasspathAsURLArray(IJavaProject javaProject) {
-		if (javaProject == null)
-			return null;
-		Set visited = new HashSet();
-		List urls = new ArrayList(20);
-		collectClasspathURLs(javaProject, urls, visited, true);
-		URL[] result = new URL[urls.size()];
-		urls.toArray(result);
-		return result;
-	}
-
-	private static void collectClasspathURLs(IJavaProject javaProject, List urls, Set visited, boolean isFirstProject) {
-		if (visited.contains(javaProject))
-			return;
-		visited.add(javaProject);
-		IPath outPath = getJavaProjectOutputAbsoluteLocation(javaProject.getProject());
-		outPath = outPath.addTrailingSeparator();
-		URL out = ProjectUtilities.createFileURL(outPath);
-		urls.add(out);
-		IClasspathEntry[] entries = null;
-		try {
-			entries = javaProject.getResolvedClasspath(true);
-		} catch (JavaModelException e) {
-			return;
-		}
-		IClasspathEntry entry;
-		for (int i = 0; i < entries.length; i++) {
-			entry = entries[i];
-			switch (entry.getEntryKind()) {
-				case IClasspathEntry.CPE_LIBRARY:
-				case IClasspathEntry.CPE_CONTAINER:
-				case IClasspathEntry.CPE_VARIABLE:
-					collectClasspathEntryURL(entry, urls);
-					break;
-				case IClasspathEntry.CPE_PROJECT: {
-					if (isFirstProject || entry.isExported())
-						collectClasspathURLs(getJavaProject(entry), urls, visited, false);
-					break;
-				}
-			}
-		}
-	}
-
-	private static void collectClasspathEntryURL(IClasspathEntry entry, List urls) {
-		IPath path = entry.getPath();
-		if (null == path.getDevice()) {
-			// workspace resource - is the IPath a file, folder, or a class folder whose location is the project root?
-			if(path.segmentCount() == 1) {
-				// It's a class folder whose location is the project root
-				path = ResourcesPlugin.getWorkspace().getRoot().getProject(path.lastSegment()).getLocation();
-			}
-			else {
-				// It's a file or folder - capture it's absolute location
-				IFile jarFile = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-				if( jarFile.exists() ){
-					path = jarFile.getLocation();
-				}
-			}
-		}
-
-		URL url = ProjectUtilities.createFileURL(path);
-		if (url != null)
-			urls.add(url);
-	}
-
-
-	private static IJavaProject getJavaProject(IClasspathEntry entry) {
-		IProject proj = ResourcesPlugin.getWorkspace().getRoot().getProject(entry.getPath().segment(0));
-		if (proj != null)
-			return getJavaProject(proj);
-		return null;
-	}
-
-	/**
-	 * Is this project a binary project.
-	 * <p>
-	 * Typically a Java project is considered binary if it does not have a source entry in the classpath.
-	 * 
-	 * @param project
-	 *            Project to test
-	 * @return <code>true</code> if project is a binary project.
-	 */
-	public static boolean isBinaryProject(IProject aProject) {
-	
-		IJavaProject javaProj = getJavaProject(aProject);
-		if (javaProj == null)
-			return false;
-		IClasspathEntry[] entries = null;
-		try {
-			entries = javaProj.getRawClasspath();
-		} catch (JavaModelException jme) {
-			return false;
-		}
-		for (int i = 0; i < entries.length; i++) {
-			IClasspathEntry entry = entries[i];
-			if (entry.getEntryKind() == IClasspathEntry.CPE_SOURCE)
-				return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Append to java class path.
-	 * <p>
-	 * Append a list of IClasspathEntry's to the build path of the passed project. Updated to remove existing occurrences of the passed entries before
-	 * appending.
-	 * </p>
-	 * 
-	 * @param p
-	 *            project
-	 * @param appendClasspathEntries
-	 *            list of entries
-	 * @throws JavaModelException
-	 * 
-	 * @since 1.0.0
-	 */
-	public static void appendJavaClassPath(IProject p, List appendClasspathEntries) throws JavaModelException {
-		IJavaProject javaProject = null;
-		try {
-			javaProject = (IJavaProject) p.getNature(JavaCore.NATURE_ID);
-		} catch (CoreException ignore) {
-		}
-		if (javaProject != null) {
-			IClasspathEntry[] classpath = javaProject.getRawClasspath();
-			List newPathList = new ArrayList(classpath.length);
-			for (int i = 0; i < classpath.length; i++) {
-				IClasspathEntry entry = classpath[i];
-				// Skip entries which are in the append list
-				if (appendClasspathEntries.indexOf(entry) < 0)
-					newPathList.add(entry);
-			}
-			newPathList.addAll(appendClasspathEntries);
-			IClasspathEntry[] newClasspath = (IClasspathEntry[]) newPathList.toArray(new IClasspathEntry[newPathList.size()]);
-			javaProject.setRawClasspath(newClasspath, new NullProgressMonitor());
-		}
-	}
-
-	/**
-	 * Append classpath entry.
-	 * <p>
-	 * 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.
-	 * </p>
-	 * 
-	 * @param p
-	 *            Project
-	 * @param newEntry
-	 *            Entry
-	 * @throws JavaModelException
-	 * 
-	 * @since 1.0.0
-	 */
-	public static void appendJavaClassPath(IProject p, IClasspathEntry newEntry) throws JavaModelException {
-		IJavaProject javaProject = 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());
-	}
-
-	/**
-	 * Return the source path matching the parameter; if the parameter is null, or if the source folder is not on the classpath, return the first
-	 * source path on the classpath
-	 * 
-	 * @param p
-	 *            project
-	 * @param defaultSourceName
-	 *            source folder to find if on classpath, or if <code>null</code> the first folder
-	 * @return path searched for or <code>null</code> if not java project or some other problem.
-	 * 
-	 * @since 1.0.0
-	 */
-	public static IPath getSourcePathOrFirst(IProject p, String defaultSourceName) {
-		IJavaProject javaProj = 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 = ProjectUtilities.createPath(p, defaultSourceName);
-		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;
-	}
-
-	/**
-	 * Hack to force a reload of the .classpath file
-	 * 
-	 * @param project
-	 *            project to reload
-	 * @since 1.0.0
-	 */
-	public static void forceClasspathReload(IProject project) throws JavaModelException {
-		IJavaProject javaProj = getJavaProject(project);
-		if (javaProj != null) {
-			IClasspathEntry[] entries = javaProj.readRawClasspath();
-			if (entries != null) {
-				IPath output = javaProj.readOutputLocation();
-				if (output != null)
-					javaProj.setRawClasspath(entries, output, null);
-			}
-		}
-	}
-
-	/**
-	 * Get the paths of all of the local jars in the classpath for the project. It does not recurse into referenced projects.
-	 * 
-	 * @param proj
-	 *            project to search (should be a java project).
-	 * @return A list of IPath, where each entry is a project relative path to a JAR contained in the project.
-	 */
-	public static List getLocalJARPathsFromClasspath(IProject proj) {
-		IJavaProject javaProj = getJavaProject(proj);
-		if (javaProj == null)
-			return null;
-		IPath projectPath = proj.getFullPath();
-		List result = new ArrayList();
-		try {
-			IClasspathEntry[] entries = javaProj.getRawClasspath();
-			for (int i = 0; i < entries.length; i++) {
-				IClasspathEntry entry = entries[i];
-				if (entry.getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
-					IPath path = entry.getPath();
-					int segments = path.matchingFirstSegments(projectPath);
-					if (segments > 0)
-						result.add(path.removeFirstSegments(segments));
-				}
-			}
-		} catch (JavaModelException e) {
-			JEMUtilPlugin.getLogger().logError(e);
-		}
-		return result;
-	}
-
-
-	/**
-	 * Return the source folder matching the parameter; if the parameter is null, or if the source folder is not on the classpath, return the first
-	 * source folder on the classpath
-	 * 
-	 * @param p
-	 *            project
-	 * @param defaultSourceName
-	 *            source folder to find if on classpath, or if <code>null</code> the first folder
-	 * @return container searched for or <code>null</code> if not java project or some other problem.
-	 * 
-	 * @since 1.0.0
-	 */
-	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;
-		}
-	}
-
-	/**
-	 * Returns a list of IFolder that represents each source folder in a java project
-	 * 
-	 * @deprecated Use {@link #getSourceContainers(IProject)}because the project itself might be a source container
-	 * 
-	 * @param p
-	 *            project
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	public static List getSourceFolders(IProject p) {
-		try {
-			List sourceFolders = new ArrayList();
-			List sourcePaths = getSourcePaths(p);
-			if (sourcePaths != null && !sourcePaths.isEmpty()) {
-				for (int i = 0; i < sourcePaths.size(); i++) {
-					IPath path = (IPath) sourcePaths.get(i);
-					if (!path.isEmpty())
-						sourceFolders.add(p.getFolder(path));
-				}
-			}
-			return sourceFolders;
-		} catch (IllegalArgumentException ex) {
-			return Collections.EMPTY_LIST;
-		}
-	}	
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/NoASTResolver.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/NoASTResolver.java
deleted file mode 100644
index 5c9e1e9b5..000000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/NoASTResolver.java
+++ /dev/null
@@ -1,51 +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: NoASTResolver.java,v $
- *  $Revision: 1.4 $  $Date: 2005/08/24 21:13:53 $ 
- */
-package org.eclipse.jem.workbench.utility;
-
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jdt.core.dom.Type;
-
-import org.eclipse.jem.internal.instantiation.InstantiationFactory;
-import org.eclipse.jem.internal.instantiation.PTExpression;
-import org.eclipse.jem.workbench.utility.ParseTreeCreationFromAST.InvalidExpressionException;
- 
-
-/**
- * This is used for AST Resolution, but it simply turns Name into PTName. Useful when
- * just creating a parse tree where we know the names are ok and just types. 
- * @since 1.0.0
- */
-public class NoASTResolver extends ASTBoundResolver {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.workbench.utility.ParseTreeCreationFromAST.Resolver#resolveName(org.eclipse.jdt.core.dom.Name)
-	 */
-	public PTExpression resolveName(Name name) throws InvalidExpressionException {
-		return InstantiationFactory.eINSTANCE.createPTName(name.toString());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.workbench.utility.ParseTreeCreationFromAST.Resolver#resolveType(org.eclipse.jdt.core.dom.Type)
-	 */
-	public String resolveType(Type type) {
-		return type.toString();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.workbench.utility.ParseTreeCreationFromAST.Resolver#resolveType(org.eclipse.jdt.core.dom.Name)
-	 */
-	public String resolveType(Name name) throws InvalidExpressionException {
-		return name.toString();
-	}
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/ParseTreeCreationFromAST.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/ParseTreeCreationFromAST.java
deleted file mode 100644
index 9b668ba62..000000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/ParseTreeCreationFromAST.java
+++ /dev/null
@@ -1,587 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: ParseTreeCreationFromAST.java,v $
- *  $Revision: 1.19 $  $Date: 2006/05/17 20:13:58 $ 
- */
-package org.eclipse.jem.workbench.utility;
-
-import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.jdt.core.dom.*;
-
-import org.eclipse.jem.internal.instantiation.*;
- 
-/**
- * Create a parse tree from an AST node.
- * @since 1.0.0
- */
-public class ParseTreeCreationFromAST extends ASTVisitor {
-	protected final Resolver resolver;
-	protected PTExpression expression;	// Each visit (or endvisit) will put into expression the result of the visit if it produced an expression.
-	
-	/**
-	 * This is the abstract base class used by ParseTreeCreationFromAST to resolve the types to the appropriate
-	 * types (e.g. "String" to "java.lang.String"). 
-	 * 
-	 * @see org.eclipse.jem.workbench.utility.ParseTreeCreationFromAST
-	 * @since 1.0.0
-	 */
-	public static abstract class Resolver {
-		
-		/**
-		 * Resolve the Name. It can return either a PTName if it is just a classname,
-		 * or a PTFieldAccess if it resolves to a PTFieldAccess. The PTFieldAccess should
-		 * be complete. e.g we have class like:
-		 * <code>
-		 * 	package xyz; 
-		 * 	public class AClass {
-		 * 		public java.awt.Rectangle rect;
-		 * 	} 
-		 * </code>
-		 * Then a Name like <code>AClass.rect.x</code> should resolve to:
-		 * 
-		 * PTFieldAccess:
-		 * 	receiver: 
-		 * 		PTFieldAccess
-		 * 			receiver: xyz.AClass
-		 * 			field: "rect"
-		 * 	field: "x"
-		 *
-		 * Actually it can return any valid expression that has a value (i.e. it cannot be a method invocation with a <code>void</code> return type). 
-		 * 
-		 * @param name
-		 * @return Either a fully-qualified name (as a PTName) or a PTFieldAccess, any other type of expression.
-		 * 
-		 * @since 1.0.0
-		 */
-		public abstract PTExpression resolveName(Name name) throws InvalidExpressionException;
-		
-		/**
-		 * Resolve the type. If it is an array type return it in format "type[][]".
-		 * 
-		 * @param type
-		 * @return The type name, including brackets if array type.
-		 * 
-		 * @since 1.0.0
-		 */
-		public abstract String resolveType(Type type) throws InvalidExpressionException;
-		
-		/**
-		 * This is for resolving "this" literal. It should either return a PTThisLiteral, if it
-		 * can't do resolve, or some PTExpression that can resolve to "this" for evaluation.
-		 * 
-		 * @return If resolvable, a PTExpression, else a PTThisLiteral if not resolvable.
-		 * @throws InvalidExpressionException
-		 * 
-		 * @since 1.0.0
-		 */
-		public abstract PTExpression resolveThis() throws InvalidExpressionException;
-		
-		/**
-		 * Resolve the type specified as a Name. It may be a simple name or it may be
-		 * a qualified name. This is used when we have Name that we know must be a
-		 * type. This is so that there is no confusion with it possibly being a field or variable
-		 * that has the same case and spelling as a type name.
-		 * @param name
-		 * @return the type name.
-		 * @throws InvalidExpressionException
-		 * 
-		 * @since 1.0.0
-		 */
-		public abstract String resolveType(Name name) throws InvalidExpressionException;
-		
-		/**
-		 * This is used by the resolver if it can't resolve for some reason. This will throw
-		 * an invalid expression exception which will be handled by the ParseTreeCreationFromAST.
-		 * 
-		 * @param msg Message to be put into the exception.
-		 * @throws InvalidExpressionException
-		 * 
-		 * @since 1.0.0
-		 */
-		protected final void throwInvalidExpressionException(String msg) throws InvalidExpressionException {
-			throw new InvalidExpressionException(msg);
-		}
-	}
-	
-	/*
-	 * When an invalid expression has been found this exception should be thrown. It will
-	 * be caught at the top and converted into an InvalidExpression and the rest of the parse tree will be
-	 * thrown away. 
-	 * 
-	 * The message will be a message as to why it is invalid.
-	 * 
-	 * @since 1.0.0
-	 */
-	protected static class InvalidExpressionException extends IllegalArgumentException {
-		
-		/**
-		 * Comment for <code>serialVersionUID</code>
-		 * 
-		 * @since 1.1.0
-		 */
-		private static final long serialVersionUID = 2429845631915206678L;
-
-		/**
-		 * @param s The message to be used in the final invalid expression.
-		 * 
-		 * @since 1.0.0
-		 */
-		public InvalidExpressionException(String s) {
-			super(s);
-		}
-	}
-
-	/**
-	 * Construct with the given resolver.
-	 * 
-	 * @param resolver
-	 * 
-	 * @since 1.0.0
-	 */
-	public ParseTreeCreationFromAST(Resolver resolver) {
-		this.resolver = resolver;
-	}
-
-	/**
-	 * Process the AST Expression and return a PTExpression. If any part was invalid, then
-	 * only an PTInvalidExpression will be returned.
-	 * 
-	 * @param astExpression
-	 * @return The PTExpression.
-	 * 
-	 * @since 1.0.0
-	 */
-	public final PTExpression createExpression(Expression astExpression) {
-		try {
-			return perform(astExpression);
-		} catch (InvalidExpressionException e) {
-			// Create a msg that is formed of the exception message and the full init string.
-			String msg = MessageFormat.format(WorkbenchUtilityMessages.ParseTreeCreationFromAST_0, new Object[] {e.getLocalizedMessage(), astExpression.toString()}); 
-			PTInvalidExpression exp = InstantiationFactory.eINSTANCE.createPTInvalidExpression();
-			exp.setMessage(msg);
-			return exp;
-		}	
-	}
-	
-	/*
-	 * Visit the AST expression and get the ParseTree Expression.
-	 * This is used by the individual visits when parsing a tree.
-	 * It passes to the top method (createExpression), which can
-	 * handle the InvalidExpressionException.
-	 * 
-	 * If any visit doesn't return an expression, then an invalid
-	 * expression exception will be thrown to indicate this. If the
-	 * incoming expression is <code>null</code>, then return of <code>null</code> is ok because
-	 * this would be for an optional expression which didn't exist.
-	 * 
-	 * @return The new ParseTree Expression or <code>null</code> if incoming expression was null. 
-	 * 
-	 * @see createExpression(org.eclipse.jdt.core.dom.Expression)
-	 * @exception InvalidExpressionException
-	 * @since 1.0.0
-	 */
-	protected final PTExpression perform(Expression astExpression) {
-		if (astExpression != null) {
-			expression = null;
-			astExpression.accept(this);
-			if (expression == null)
-				throw new InvalidExpressionException(MessageFormat.format(WorkbenchUtilityMessages.ParseTreeCreationFromAST_ExpressionTooComplicated_EXC_, new Object[] {astExpression.toString()})); 
-			return expression;
-		} else
-			return null;	// This is ok. It means an optional expression was being processed and the expression didn't exist.
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.ArrayAccess)
-	 */
-	public boolean visit(ArrayAccess node) {
-		PTArrayAccess aa = InstantiationFactory.eINSTANCE.createPTArrayAccess();
-		List indexes = aa.getIndexes();
-		Expression arrayExp = node;
-		while (arrayExp.getNodeType() == ASTNode.ARRAY_ACCESS) {
-			// Visit the index to get the index expression.
-			ArrayAccess array = (ArrayAccess) arrayExp; 
-			indexes.add(0, perform(array.getIndex()));	// We're trying to create the final expression from inside out, the indexes are created in reverse order.
-			arrayExp = array.getArray();
-		}
-		aa.setArray(perform(arrayExp));	// Final arrayExp is the true expression.
-		expression = aa;	// Set the return expression for this visit.
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.ArrayCreation)
-	 */
-	public boolean visit(ArrayCreation node) {
-		PTArrayCreation ac = InstantiationFactory.eINSTANCE.createPTArrayCreation();
-		ac.setType(resolver.resolveType(node.getType()));
-		List acDims = ac.getDimensions();
-		List nDims = node.dimensions();
-		int nsize = nDims.size();
-		for (int i = 0; i < nsize; i++) {
-			acDims.add(perform((Expression) nDims.get(i)));
-		}
-		ac.setInitializer((PTArrayInitializer) perform(node.getInitializer()));
-		expression = ac;
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.ArrayInitializer)
-	 */
-	public boolean visit(ArrayInitializer node) {
-		PTArrayInitializer ai = InstantiationFactory.eINSTANCE.createPTArrayInitializer();
-		List exps = node.expressions();
-		List aiexps = ai.getExpressions();
-		int nexp = exps.size();
-		for (int i = 0; i < nexp; i++) {
-			aiexps.add(perform((Expression) exps.get(i)));
-		}
-		expression = ai;
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.Assignment)
-	 */
-	public boolean visit(Assignment node) {
-		return false;	// We can't handle assignment.
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.BooleanLiteral)
-	 */
-	public boolean visit(BooleanLiteral node) {
-		PTBooleanLiteral bl = InstantiationFactory.eINSTANCE.createPTBooleanLiteral();
-		bl.setBooleanValue(node.booleanValue());
-		expression = bl;
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.CastExpression)
-	 */
-	public boolean visit(CastExpression node) {
-		PTCastExpression ct	= InstantiationFactory.eINSTANCE.createPTCastExpression();
-		ct.setType(resolver.resolveType(node.getType()));
-		ct.setExpression(perform(node.getExpression()));
-		expression = ct;
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.CharacterLiteral)
-	 */
-	public boolean visit(CharacterLiteral node) {
-		PTCharacterLiteral cl = InstantiationFactory.eINSTANCE.createPTCharacterLiteral();
-		cl.setEscapedValue(node.getEscapedValue());
-		cl.setCharValue(node.charValue());
-		expression = cl;
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.ClassInstanceCreation)
-	 */
-	public boolean visit(ClassInstanceCreation node) {
-		if (node.getAnonymousClassDeclaration() != null) { 
-			PTAnonymousClassDeclaration adecl = InstantiationFactory.eINSTANCE.createPTAnonymousClassDeclaration();
-			adecl.setDeclaration(node.toString());
-			expression = adecl;
-		} else {
-			PTClassInstanceCreation cic = InstantiationFactory.eINSTANCE.createPTClassInstanceCreation();
-			// If ast level = 2, then you must use getName, but the name needs to be turned into a type
-			// so that it can be resolved. If ast level > 2, then it will return a type to be resolved.
-			// Note: can't just use resolve name on the name because if a field and a class were spelled
-			// the same then the codegen resolver would return an instance ref to the field instead.
-			String type = node.getAST().apiLevel() == AST.JLS2 ? resolver.resolveType(node.getName()) : resolver.resolveType(node.getType());
-			if (type == null) {
-				type = node.getAST().apiLevel() == AST.JLS2 ? node.getName().getFullyQualifiedName() : node.getType().toString();
-			}
-			cic.setType(type);
-			List args = cic.getArguments();
-			List nargs = node.arguments();
-			int nsize = nargs.size();
-			for (int i = 0; i < nsize; i++) {
-				args.add(perform((Expression) nargs.get(i)));
-			}
-			expression = cic;
-		}
-		return false;
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.ConditionalExpression)
-	 */
-	public boolean visit(ConditionalExpression node) {
-		PTConditionalExpression ce = InstantiationFactory.eINSTANCE.createPTConditionalExpression();
-		ce.setCondition(perform(node.getExpression()));
-		ce.setTrue(perform(node.getThenExpression()));
-		ce.setFalse(perform(node.getElseExpression()));
-		expression = ce;
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.FieldAccess)
-	 */
-	public boolean visit(FieldAccess node) {
-		expression = createFieldAccess(node.getName().getIdentifier(), perform(node.getExpression()));
-		return false;
-	}
-	
-	protected PTExpression createFieldAccess(String name, PTExpression receiver) {
-		PTFieldAccess fa = InstantiationFactory.eINSTANCE.createPTFieldAccess();
-		fa.setReceiver(receiver);
-		fa.setField(name);
-		return fa;
-	}
-
-	private static HashMap infixOperToParseOper;
-	private final PTInfixOperator getParseInfix(InfixExpression.Operator operator) {
-		if (prefixOperToParseOper == null) {
-			infixOperToParseOper = new HashMap(5);
-			infixOperToParseOper.put(InfixExpression.Operator.AND, PTInfixOperator.AND_LITERAL);
-			infixOperToParseOper.put(InfixExpression.Operator.CONDITIONAL_AND, PTInfixOperator.CONDITIONAL_AND_LITERAL);
-			infixOperToParseOper.put(InfixExpression.Operator.CONDITIONAL_OR, PTInfixOperator.CONDITIONAL_OR_LITERAL);
-			infixOperToParseOper.put(InfixExpression.Operator.DIVIDE, PTInfixOperator.DIVIDE_LITERAL);
-			infixOperToParseOper.put(InfixExpression.Operator.EQUALS, PTInfixOperator.EQUALS_LITERAL);
-			infixOperToParseOper.put(InfixExpression.Operator.GREATER_EQUALS, PTInfixOperator.GREATER_EQUALS_LITERAL);
-			infixOperToParseOper.put(InfixExpression.Operator.GREATER, PTInfixOperator.GREATER_LITERAL);
-			infixOperToParseOper.put(InfixExpression.Operator.LEFT_SHIFT, PTInfixOperator.LEFT_SHIFT_LITERAL);
-			infixOperToParseOper.put(InfixExpression.Operator.LESS_EQUALS, PTInfixOperator.LESS_EQUALS_LITERAL);
-			infixOperToParseOper.put(InfixExpression.Operator.LESS, PTInfixOperator.LESS_LITERAL);
-			infixOperToParseOper.put(InfixExpression.Operator.MINUS, PTInfixOperator.MINUS_LITERAL);
-			infixOperToParseOper.put(InfixExpression.Operator.NOT_EQUALS, PTInfixOperator.NOT_EQUALS_LITERAL);
-			infixOperToParseOper.put(InfixExpression.Operator.OR, PTInfixOperator.OR_LITERAL);
-			infixOperToParseOper.put(InfixExpression.Operator.PLUS, PTInfixOperator.PLUS_LITERAL);
-			infixOperToParseOper.put(InfixExpression.Operator.REMAINDER, PTInfixOperator.REMAINDER_LITERAL);
-			infixOperToParseOper.put(InfixExpression.Operator.RIGHT_SHIFT_SIGNED, PTInfixOperator.RIGHT_SHIFT_SIGNED_LITERAL);
-			infixOperToParseOper.put(InfixExpression.Operator.RIGHT_SHIFT_UNSIGNED, PTInfixOperator.RIGHT_SHIFT_UNSIGNED_LITERAL);
-			infixOperToParseOper.put(InfixExpression.Operator.TIMES, PTInfixOperator.TIMES_LITERAL);
-			infixOperToParseOper.put(InfixExpression.Operator.XOR, PTInfixOperator.XOR_LITERAL);
-		}
-		return (PTInfixOperator) infixOperToParseOper.get(operator);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.InfixExpression)
-	 */
-	public boolean visit(InfixExpression node) {
-		PTInfixExpression inf = InstantiationFactory.eINSTANCE.createPTInfixExpression();
-		inf.setLeftOperand(perform(node.getLeftOperand()));
-		PTInfixOperator inoper = getParseInfix(node.getOperator());
-		if (inoper == null) {
-			// It is not one we can handle.
-			throw new InvalidExpressionException(
-					MessageFormat.format(WorkbenchUtilityMessages.ParseTreeCreationFromAST_OperatorTooComplicatedToHandle_EXC_, new Object[] { node.getOperator().toString() })); 
-		}
-		inf.setOperator(inoper);
-		inf.setRightOperand(perform(node.getRightOperand()));
-		List eops = inf.getExtendedOperands();
-		List neops = node.extendedOperands();
-		int nsize = neops.size();
-		for (int i = 0; i < nsize; i++) {
-			eops.add(perform((Expression) neops.get(i)));
-		}
-		expression = inf;
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.InstanceofExpression)
-	 */
-	public boolean visit(InstanceofExpression node) {
-		PTInstanceof inof = InstantiationFactory.eINSTANCE.createPTInstanceof();
-		inof.setOperand(perform(node.getLeftOperand()));
-		inof.setType(resolver.resolveType(node.getRightOperand()));
-		expression = inof;
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.PostfixExpression)
-	 */
-	public boolean visit(PostfixExpression node) {
-		return false;	// We can't handle post fix.
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.MethodInvocation)
-	 */
-	public boolean visit(MethodInvocation node) {
-		expression = createMethodInvocation(node.getName().getIdentifier(), perform(node.getExpression()), node.arguments());
-		return false;
-	}
-
-	/**
-	 * Create a method invocation using the giving receiver, name, args.
-	 * @param node
-	 * @return
-	 * 
-	 * @since 1.2.0
-	 */
-	protected PTMethodInvocation createMethodInvocation(String name, PTExpression receiver, List argExpressions) {
-		PTMethodInvocation mi = InstantiationFactory.eINSTANCE.createPTMethodInvocation();
-		mi.setReceiver(receiver);
-		mi.setName(name);
-		List args = mi.getArguments();
-		int nsize = argExpressions.size();
-		for (int i = 0; i < nsize; i++) {
-			args.add(perform((Expression) argExpressions.get(i)));
-		}
-		return mi;
-	}
-	
-	
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.NullLiteral)
-	 */
-	public boolean visit(NullLiteral node) {
-		expression = InstantiationFactory.eINSTANCE.createPTNullLiteral();
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.NumberLiteral)
-	 */
-	public boolean visit(NumberLiteral node) {
-		PTNumberLiteral nl = InstantiationFactory.eINSTANCE.createPTNumberLiteral();
-		nl.setToken(node.getToken());
-		expression = nl;
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.ParenthesizedExpression)
-	 */
-	public boolean visit(ParenthesizedExpression node) {
-		PTParenthesizedExpression pe = InstantiationFactory.eINSTANCE.createPTParenthesizedExpression();
-		pe.setExpression(perform(node.getExpression()));
-		expression = pe;
-		return false;
-	}
-
-	private static HashMap prefixOperToParseOper;
-	private final PTPrefixOperator getParsePrefix(PrefixExpression.Operator operator) {
-		if (prefixOperToParseOper == null) {
-			prefixOperToParseOper = new HashMap(5);
-			prefixOperToParseOper.put(PrefixExpression.Operator.COMPLEMENT, PTPrefixOperator.COMPLEMENT_LITERAL);
-			prefixOperToParseOper.put(PrefixExpression.Operator.MINUS, PTPrefixOperator.MINUS_LITERAL);
-			prefixOperToParseOper.put(PrefixExpression.Operator.NOT, PTPrefixOperator.NOT_LITERAL);
-			prefixOperToParseOper.put(PrefixExpression.Operator.PLUS, PTPrefixOperator.PLUS_LITERAL);
-		}
-		return (PTPrefixOperator) prefixOperToParseOper.get(operator);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.PrefixExpression)
-	 */
-	public boolean visit(PrefixExpression node) {
-		if (node.getOperand().getNodeType() == ASTNode.NUMBER_LITERAL) {
-			// For number literals we see if it is a "+" or "-" prefix, and if it is, we simply
-			// create a PTNumberLiteral with the operator already in it. It is a simplification.
-			// Any other operator we've left alone since those won't be decoded simply by the
-			// Number decoder.
-			// If not a number literal, then leave alone since needs to be handled as a prefix
-			// operation.
-			PrefixExpression.Operator operator = node.getOperator();
-			if (operator == PrefixExpression.Operator.PLUS || operator == PrefixExpression.Operator.MINUS) {
-				PTNumberLiteral nm = InstantiationFactory.eINSTANCE.createPTNumberLiteral();
-				nm.setToken(operator.toString() + ((NumberLiteral) node.getOperand()).getToken());
-				expression = nm;
-				return false;
-			}
-		}
-
-		PTPrefixExpression pe = InstantiationFactory.eINSTANCE.createPTPrefixExpression();
-		PTPrefixOperator ptoper = getParsePrefix(node.getOperator());
-		if (ptoper == null) {
-			// It is not one we can handle.
-			throw new InvalidExpressionException(
-				MessageFormat.format(WorkbenchUtilityMessages.ParseTreeCreationFromAST_OperatorTooComplicatedToHandle_EXC_, new Object[] { node.getOperator().toString() })); 
-		}
-		pe.setOperator(ptoper);
-		pe.setExpression(perform(node.getOperand()));
-		expression = pe;
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.QualifiedName)
-	 */
-	public boolean visit(QualifiedName node) {
-		expression = resolver.resolveName(node);
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.SimpleName)
-	 */
-	public boolean visit(SimpleName node) {
-		expression = resolver.resolveName(node);
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.StringLiteral)
-	 */
-	public boolean visit(StringLiteral node) {
-		PTStringLiteral sl = InstantiationFactory.eINSTANCE.createPTStringLiteral();
-		sl.setEscapedValue(node.getEscapedValue());
-		sl.setLiteralValue(node.getLiteralValue());
-		expression = sl;
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.SuperFieldAccess)
-	 */
-	public boolean visit(SuperFieldAccess node) {
-		expression = createFieldAccess(node.getName().getIdentifier(), resolver.resolveThis());
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.SuperMethodInvocation)
-	 */
-	public boolean visit(SuperMethodInvocation node) {
-		expression = createMethodInvocation(node.getName().getIdentifier(), resolver.resolveThis(), node.arguments());
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.ThisExpression)
-	 */
-	public boolean visit(ThisExpression node) {
-		expression = resolver.resolveThis();
-		return false;	
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.TypeLiteral)
-	 */
-	public boolean visit(TypeLiteral node) {
-		PTTypeLiteral ptl = InstantiationFactory.eINSTANCE.createPTTypeLiteral();
-		ptl.setType(resolver.resolveType(node.getType()));
-		expression = ptl;
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/WorkbenchUtilityMessages.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/WorkbenchUtilityMessages.java
deleted file mode 100644
index 13f09e2a5..000000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/WorkbenchUtilityMessages.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.jem.workbench.utility;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class WorkbenchUtilityMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.jem.workbench.utility.messages";//$NON-NLS-1$
-
-	private WorkbenchUtilityMessages() {
-		// Do not instantiate
-	}
-
-	public static String ParseTreeCreationFromAST_0;
-	public static String ParseTreeCreationFromAST_ExpressionTooComplicated_EXC_;
-	public static String ParseTreeCreationFromAST_OperatorTooComplicatedToHandle_EXC_;
-	public static String ASTBoundResolver_CannotHandleLocalField_EXC_;
-	public static String ASTBoundResolver_CannotHandleLocalVariable_EXC_;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, WorkbenchUtilityMessages.class);
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/messages.properties b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/messages.properties
deleted file mode 100644
index 9917f346f..000000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/messages.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-ParseTreeCreationFromAST_0                                       = {0} - {1}
-ParseTreeCreationFromAST_ExpressionTooComplicated_EXC_           = IWAV0177E Expression "{0}" is too complicated.
-ParseTreeCreationFromAST_OperatorTooComplicatedToHandle_EXC_     = IWAV0179E Operator "{0}" is too complicated to handle.
-ASTBoundResolver_CannotHandleLocalField_EXC_=Cannot handle local field access of "{0}"
-ASTBoundResolver_CannotHandleLocalVariable_EXC_=Cannot handle local variable access of "{0}"
diff --git a/plugins/org.eclipse.jem/.classpath b/plugins/org.eclipse.jem/.classpath
deleted file mode 100644
index c55462841..000000000
--- a/plugins/org.eclipse.jem/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="javainst/"/>
-	<classpathentry kind="src" path="mofjava/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/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.core.resources.prefs b/plugins/org.eclipse.jem/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 47d697d0d..000000000
--- a/plugins/org.eclipse.jem/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Apr 15 21:21:26 EDT 2007
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/plugins/org.eclipse.jem/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jem/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 94f0387f9..000000000
--- a/plugins/org.eclipse.jem/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,294 +0,0 @@
-#Sun Apr 15 21:28:08 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-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.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=error
-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.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-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.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
-org.eclipse.jdt.core.formatter.comment.format_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=150
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=150
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
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/META-INF/MANIFEST.MF b/plugins/org.eclipse.jem/META-INF/MANIFEST.MF
deleted file mode 100644
index 2d62d26fe..000000000
--- a/plugins/org.eclipse.jem/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,29 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jem; singleton:=true
-Bundle-Version: 1.2.4.qualifier
-Bundle-Activator: org.eclipse.jem.internal.core.JEMPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jem.internal.core;x-friends:="org.eclipse.jem.beaninfo,org.eclipse.jem.proxy,org.eclipse.jem.tests,org.eclipse.jem.ui,org.eclipse.jem.util,org.eclipse.jem.workbench",
- org.eclipse.jem.internal.instantiation,
- org.eclipse.jem.internal.instantiation.base,
- org.eclipse.jem.internal.instantiation.impl,
- org.eclipse.jem.internal.java.adapters;x-friends:="org.eclipse.jem.beaninfo,org.eclipse.jem.workbench",
- org.eclipse.jem.internal.java.adapters.jdk;x-friends:="org.eclipse.jem.workbench",
- org.eclipse.jem.internal.java.adapters.nls;x-friends:="org.eclipse.jem.workbench",
- org.eclipse.jem.internal.java.beaninfo,
- org.eclipse.jem.internal.java.init;x-friends:="org.eclipse.jem.beaninfo",
- org.eclipse.jem.internal.java.instantiation,
- org.eclipse.jem.java,
- org.eclipse.jem.java.adapters,
- org.eclipse.jem.java.impl,
- org.eclipse.jem.java.internal.impl;x-friends:="org.eclipse.jem.beaninfo,org.eclipse.jem.workbench",
- org.eclipse.jem.java.util
-Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jem.proxy;bundle-version="[1.2.0,2.0.0)";resolution:=optional,
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem.util;bundle-version="[1.2.0,2.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
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 3f80a73b2..000000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTCharacterLiteralImpl.java
+++ /dev/null
@@ -1,376 +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.6.1 $  $Date: 2008/10/23 20:14:29 $ 
- */
-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:
-				b.append(character);
-		}
-	}
-
-	/**
-	 * <!-- 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 5b534edb5..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/core/JEMPlugin.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
- *******************************************************************************/
-/*
- *  $RCSfile: JEMPlugin.java,v $
- *  $Revision: 1.8.6.1 $  $Date: 2008/09/24 07:07:12 $ 
- */
-package org.eclipse.jem.internal.core;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.Platform;
-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;
-	private static final String PLUGIN_ID = "org.eclipse.jem"; //$NON-NLS-1$
-	
-	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;
-	}
-	
-	public String getPluginID() {
-		return PLUGIN_ID;
-	}
-	
-	public static IStatus createStatus(int severity, String message, Throwable exception) {
-		return new Status(severity, PLUGIN_ID, severity, message, exception);
-	}
-	
-	public static void logWarning(String message, Throwable exception) {
-		Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.WARNING, message , exception));
-	}
-	
-	public static void logError(String message, Throwable exception) {
-		Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, message , exception));
-	}
-
-
-}
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 ce00601f1..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/ReflectionAdaptor.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.adapters;
-/*
- *  $RCSfile: ReflectionAdaptor.java,v $
- *  $Revision: 1.14.6.1 $  $Date: 2008/09/24 07:07:12 $ 
- */
-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.core.JEMPlugin;
-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);
-				JEMPlugin.logWarning(ResourceHandler.getString("Failed_reflecting_values_ERROR_"), 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 42e872c29..000000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaClassImpl.java
+++ /dev/null
@@ -1,1959 +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.6.1 $  $Date: 2009/10/01 22:01:28 $ 
- */
-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);
-		}
-		
-		List allMethods = null;
-		if(onlyPublic){
-			allMethods = getPublicMethods();
-		} else{
-			allMethods = new ArrayList();
-			synchronized(getMethods()){
-				allMethods.addAll(getMethods());
-			}
-		}
-		it1 = allMethods.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.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 2435004a8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,83 +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.57.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)",
- org.eclipse.jdt.core;bundle-version="[3.2.3,3.3.0)",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.6,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 f55afa610..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveManifestImpl.java
+++ /dev/null
@@ -1,355 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest
-	 */
-	public void appendClassPath(java.lang.String extension) {
-		String classPath = getClassPath();
-		if (classPath != null)
-			setClassPath(classPath + " " + extension);//$NON-NLS-1$
-		else
-			setClassPath(extension);
-	}
-
-	/**
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest
-	 */
-	public java.lang.String getClassPath() {
-		return ArchiveUtil.getValueIgnoreKeyCase(Attributes.Name.CLASS_PATH.toString(), getMainAttributes());
-	}
-
-	/**
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.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 org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.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 org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.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 org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.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 org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.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;
-			// bug 233801 - we are splitting every 72 bytes, but adding two bytes to the end of, 
-			// and one space at the beginning of every line after the first
-			while (index - 1 < length) {
-				if (line.charAt(index) == ' ')
-				{
-					index--;
-				}
-				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 c38f1cedf..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ArchiveCopySessionUtility.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.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.ejb.internal.impl.ContainerManagedEntityImpl;
-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()) {
-			if (shouldCopyReference(aReference, aRefObject)) { // Bugzilla 177397
-				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);
-		}
-	}
-
-    /**
-     * <p>Constant introduced for bugzilla 177397: The name of the CMP 'keyAttributes'
-     * attribute, which is not to be copied if in an uninitialized state.</p>
-     */
-    
-    public static final String CMP_KEY_ATTRIBUTES_NAME = "keyAttributes";
-
-    /**
-     * <p>Test introduced for bugzilla 177397: Tell if a specified reference
-     * should be copied.  This implementation checks for a CMP Bean, and for
-     * the key attributes attribute, and answers false when this attribute
-     * is in an uninitialized state.</p>
-     * 
-     * <p>This attribute is initialized using reflection; there are copy cases
-     * where the parent EJB Jar does not have its full classpath environment
-     * available, which prevents the loading of dependent classes.  Since the
-     * initialization is lazy, there is no need to resolve this when copying;
-     * access to the copy target can perform the initialization.</p>
-     *
-     * @param aReference The reference attribute being copied.
-     * @param aRefObject The model object being copied.
-     * 
-     * @return True if the reference attribute is to be copied.
-     *         False if the reference attribute is not to be copied.
-     */
-    
-    protected boolean shouldCopyReference(EReference aReference, EObject aRefObject)
-    {        
-        if ( !(aRefObject instanceof ContainerManagedEntityImpl) ||
-             !aReference.getName().equals(CMP_KEY_ATTRIBUTES_NAME) )
-            return true;    
-        
-        ContainerManagedEntityImpl cmpBean = (ContainerManagedEntityImpl) aRefObject;
-        
-        return cmpBean.getIsInitializedKeyAttributes();
-    }
-}
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 96939b003..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/DirectoryLoadStrategyImpl.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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;
-
-	    int offset = root.length();
-
-	    while ( (offset > 0) && root.charAt(offset - 1) == '/' )
-	        offset--;
-
-	    if ( offset < root.length() ) {
-	        offset++;
-
-	        if ( offset < root.length() )
-	            root = root.substring(0, offset);
-	    } else {
-	        root += '/';
-	    }
-
-	    String name = replaceSeparators(fileName);
-
-	    if ( name.startsWith(root) )
-	        name = name.substring( root.length() );
-	    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 7c21ae118..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategyImpl.java
+++ /dev/null
@@ -1,597 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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());
-			
-			// TFB: Problem here:
-			// 'Archive.initializeClassLoader' calls
-			// 'Archive.getJavaAdapterFactory', which
-			// 'Archive.getResourceSet', which calls
-			// 'LoadStrategy.initializeResourceSet', which calls
-			// 'Archive.initializeClassLoader' all over again.
-			//
-			// This creates a second, redundant classloader,
-			// and places the first classloader in the JavaJDKAdapterFactory.
-			// Hence not only is the classloader created twice, but
-			// both copies are active.  When there are large classpaths,
-			// this will large duplicate structures.
-			//
-			// Since the classloader will be initialized by 'getClassLoader',
-			// the initialization, here, seems unnecessary.
-			
-			// 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 7452cadca..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/ZipFileLoadStrategyImpl.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.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;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-
-
-/**
- * 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 if(includeEmptyDirectories) {
-				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;
-	}
-
-	/**
-	 * This field is used to determine whether empty directories should be included in the 
-	 * file list of this archive.  The default value is set to {@link #ArchiveUtil.INCLUDE_EMPTY_DIRECTORIES}
-	 */
-	private boolean includeEmptyDirectories = ArchiveUtil.INCLUDE_EMPTY_DIRECTORIES;
-	
-	/**
-	 * If this value has not been set, the default is defined by {@link #ArchiveUtil.INCLUDE_EMPTY_DIRECTORIES}.
-	 * 
-	 * If this value is <code>true></code> then empty directories will be included in {@link #getFiles()}.
-	 * 
-	 * @see #setIncludeEmptyDirectories(boolean)
-	 */
-	public boolean isIncludeEmptyDirectories() {
-		return includeEmptyDirectories;
-	}
-
-	/**
-	 * If this value has not been set, the default is defined by {@link #ArchiveUtil.INCLUDE_EMPTY_DIRECTORIES}.
-	 * 
-	 * @see #isIncludeEmptyDirectories()
-	 */
-	public void setIncludeEmptyDirectories(boolean includeEmptyDirectories) {
-		this.includeEmptyDirectories = includeEmptyDirectories;
-	}
-}
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 7fa413333..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/ArchiveFileDynamicClassLoader.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.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.security.ProtectionDomain;
-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;
-    
-	protected ProtectionDomain protectionDomain;
-    
-    /**
-     * <p>This constructor accepts a protection domain, which is used
-     * by <code>findClass</code>.</p>
-     * 
-     * @see ArchiveFileDynamicClassLoader#findClass(String)
-     */
-    
-    public ArchiveFileDynamicClassLoader(Archive anArchive, ClassLoader parentCl, ClassLoader extraCl, ProtectionDomain pDomain) {
-        super(parentCl);
-        setArchive(anArchive);
-        setExtraClassLoader(extraCl);
-        inEARFile = anArchive.getContainer() != null && anArchive.getContainer().isEARFile();
-        handler = new ArchiveURLStreamHandler();
-        protectionDomain = pDomain;
-    }
-
-    public ArchiveFileDynamicClassLoader(Archive anArchive, ClassLoader parentCl, ClassLoader extraCl) {
-        this(anArchive, parentCl, extraCl, null);
-	}
-
-	/**
-	 * <p>Loads a specified class.  Called only after the parent class loader has had
-     * its chance to load the class, as per the Java2 delegation model.</p>
-     * 
-     * <p>When non-null, the receiver's protection
-     * domain is passed in to the call to <code>defineClass</code>.</p>
-     * 
-     * @see ClassLoader#defineClass(String, byte[], int)
-     * @see ClassLoader#defineClass(String, byte[], int, ProtectionDomain)
-	 */
-	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) {
-            if ( protectionDomain == null ) {
-                result = defineClass(name, bytes, 0, bytes.length);
-            } else {
-                result = defineClass(name, bytes, 0, bytes.length, protectionDomain); 
-            }
-			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 d1599fdd4..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/ArchiveUtil.java
+++ /dev/null
@@ -1,918 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.Container;
-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.commonarchivecore.internal.strategy.ZipFileLoadStrategyImpl;
-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;
-	
-	/**
-	 * Flag to indicate whether empty directories should be included during import; defaults to true.
-	 * 
-	 * @see ZipFileLoadStrategyImpl#isIncludeEmptyDirectories()
-	 */
-	public static boolean INCLUDE_EMPTY_DIRECTORIES = true;
-	
-
-	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;
-	}
-
-	/**
-	 * <p>Alternate method for resolving class path entries.</p>
-	 * 
-	 * <p>Note: Not sure what this is for, as a classpath
-	 * entry such as "../targetJar.jar" seems invalid, as it
-	 * reaches outside of the EAR directory.</p>
-	 * 
-	 * <p>While this method will remove "./" from a classpath entry,
-	 * it will not remove "../", which will be added back when
-	 * deresolving the entry.  There is no meaningful name to assign
-	 * to an entity outside of the fileset of the container.</p>
-	 * 
-	 * <p>This implementation uses eclipse URI function, as opposed to the
-	 * implementation in <code>deriveEARRelativeURI</code>.</p>
-	 * 
-	 * @param classpathEntry The class-path entry which is to be resolved.
-	 * @param container The container against which to resolve the entry.
-	 * 
-	 * @return The text of the resolved entry.
-	 */
-	
-	public static String deriveRelativeURI(String classpathEntry, Container container)
-	{
-		URI containerURI = URI.createFileURI( container.getURI() );
-		// 'container.getURI()' returns a string.
-
-		URI entryURI = URI.createFileURI(classpathEntry);
-		
-		URI resolvedURI = entryURI.resolve(containerURI);
-		URI recoveredURI = resolvedURI.deresolve(containerURI);
-		
-		return recoveredURI.toFileString();
-	}
-	
-	/**
-	 * 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 832c099a7..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/RarFileDynamicClassLoader.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
- *******************************************************************************/
-/*
- * 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.security.ProtectionDomain;
-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, ProtectionDomain pDomain) {
-        super(anArchive, parentCl, extraCl, pDomain);
-    }
-    
-	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 1c24c7259..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/WarFileDynamicClassLoader.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
- *******************************************************************************/
-/*
- * 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.security.ProtectionDomain;
-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, ProtectionDomain pDomain) {
-		super(anArchive, parentCl, extraCl, pDomain);
-		allowLoadingFromWAR = anArchive.getOptions().getClassLoadingMode() == ArchiveOptions.LOAD_MODE_COMPAT;
-	}
-	
-	public WarFileDynamicClassLoader(Archive anArchive, ClassLoader parentCl, ClassLoader extraCl) {
-		this(anArchive, parentCl, extraCl, null);
-	}
-
-	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 b3c373ba0..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBValidationRuleFactory.java
+++ /dev/null
@@ -1,404 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.HashMap;
-import java.util.Map;
-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;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-/**
- * Core EJB Validation rules
- */
-public class EJBValidationRuleFactory extends AbstractEJBValidationRuleFactory {
-	private static EJBValidationRuleFactory _inst = null;
-	private static final Map contextMap = Collections.synchronizedMap(new HashMap());
-
-	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;
-	}
-	
-	public IValidationRule getRule(IEJBValidationContext vc, Object ruleId) {
-		Map ruleMap = (Map) contextMap.get(vc.getReporter());
-		if(ruleMap == null){
-			// instantiate a new set of rules for each instance of EJB validator as the rule classes
-			// are not thread safe, in case when multiple ejb validators run on multiple projects at
-			// the same time, rule objects can report incorrect errors see bug 187286
-			EJBValidationRuleFactory factory = new EJBValidationRuleFactory();
-			ruleMap = factory._ruleList;
-			contextMap.put(vc.getReporter(), ruleMap);
-		}
-		Object rule = ruleMap.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;
-	}
-	
-	public void clearRuleMap(IReporter reporter){
-		contextMap.remove(reporter);
-	}
-}
-\ No newline at end of file
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 f0a7ef277..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBValidator.java
+++ /dev/null
@@ -1,532 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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;
-		}
-		// clear the map when the ejb validator is done see bug 187286
-		EJBValidationRuleFactory.getFactory().clearRuleMap(reporter);
-		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 795ab7275..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EarValidator.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.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() == null) || (eref.getName().trim() == null) || (eref.getName().trim().length() == 0)) {
-		addError(EREF_CATEGORY, ERROR_EAR_MISSING_EREFNAME, params);
-	  }// if
-	  if (eref.isSetType())
-	    {if(eref.getType() == null ) 
-	    	addError(EREF_CATEGORY, ERROR_EAR_INVALID_EREFTYPE, params);}
-	  else 
-		  addError(EREF_CATEGORY, ERROR_EAR_MISSING_EREFTYPE, params);
-	  // if
-	  if ((eref.getHome() == null) || (eref.getHome().trim().length() == 0)) {
-		  addError(EREF_CATEGORY, ERROR_EAR_MISSING_EREFHOME, params);
-	  }// if
-	  if ((eref.getRemote() == null) || (eref.getRemote().trim().length() == 0)) {
-		  addError(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();
-				String[] params = new String[1];
-				params[0] = ref.getUri();
-				addError(EREF_CATEGORY, ERROR_MODULE_DD_FILE_NOT_FOUND, params);					
-			} 
-			
-		}
-	}	
-	
-	/**
-	 * @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(moduleRef,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(ModuleRef moduleRef, List destinationsRefs) {
-		try {
-			if( moduleRef != null && moduleRef.getDeploymentDescriptor() != null ){
-				removeAllMessages(moduleRef.getDeploymentDescriptor(),MESSAGE_DESTINATION_REF_GROUP_NAME);
-			}
-		} catch (ArchiveWrappedException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		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 f2d05ec1d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/WarValidator.java
+++ /dev/null
@@ -1,1475 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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", //$NON-NLS-1$
-				"PUT",  //$NON-NLS-1$
-				"HEAD",  //$NON-NLS-1$
-				"TRACE",  //$NON-NLS-1$
-				"POST",  //$NON-NLS-1$
-				"DELETE",  //$NON-NLS-1$
-				"OPTIONS", //$NON-NLS-1$
-				//WEBDAV
-				"ACK",  //$NON-NLS-1$
-				"ACL",  //$NON-NLS-1$
-				"BASELINE-CONTROL",  //$NON-NLS-1$
-				"BIND",  //$NON-NLS-1$
-				"BYE",  //$NON-NLS-1$
-				"CANCEL",  //$NON-NLS-1$
-				"CHECKIN",  //$NON-NLS-1$
-				"CHECKOUT",  //$NON-NLS-1$
-				"COPY",  //$NON-NLS-1$
-				"ERRORRESPONSE",  //$NON-NLS-1$
-				"INFO",  //$NON-NLS-1$
-				"INVITE",  //$NON-NLS-1$
-				"LABEL",  //$NON-NLS-1$
-				"LOCK",  //$NON-NLS-1$
-				"MERGE",  //$NON-NLS-1$
-				"MESSAGE",  //$NON-NLS-1$
-				"MKACTIVITY",  //$NON-NLS-1$
-				"MKCOL",  //$NON-NLS-1$
-				"MKWORKSPACE",  //$NON-NLS-1$
-				"MOVE",  //$NON-NLS-1$
-				"NOTIFY",  //$NON-NLS-1$
-				"PRACK",  //$NON-NLS-1$
-				"PROPFIND",  //$NON-NLS-1$
-				"PROPPATCH",  //$NON-NLS-1$
-				"PROVISIONALRESPONSE",  //$NON-NLS-1$
-				"PUBLISH",  //$NON-NLS-1$
-				"REBIND",  //$NON-NLS-1$
-				"REDIRECTRESPONSE",  //$NON-NLS-1$
-				"REGISTER",  //$NON-NLS-1$
-				"REPORT",  //$NON-NLS-1$
-				"REQUEST",  //$NON-NLS-1$
-				"RESPONSE",  //$NON-NLS-1$
-				"SEARCH",  //$NON-NLS-1$
-				"SUCCESSRESPONSE",  //$NON-NLS-1$
-				"UNBIND",  //$NON-NLS-1$
-				"UNCHECKOUT",  //$NON-NLS-1$
-				"UNLOCK",  //$NON-NLS-1$
-				"UPDATE",  //$NON-NLS-1$
-				"VERSION-CONTROL"//$NON-NLS-1$
-			}; 
-
-			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();
-
-	/**